Merge "Update modeling/modelspec to latest commit"

3 files changed, 44 insertions, 19 deletions

diff --git a/.gitmodules b/.gitmodules
index ed05eb71c..16fc69154 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -53,7 +53,6 @@
 	url = ../policy/engine
         branch = .
         ignore = dirty
-        
 [submodule "docs/submodules/vnfsdk/model.git"]
 	path = docs/submodules/vnfsdk/model.git
 	url = ../vnfsdk/model
@@ -62,27 +61,43 @@
 [submodule "docs/submodules/holmes/rule-management.git"]
 	path = docs/submodules/holmes/rule-management.git
 	url = ../holmes/rule-management
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/holmes/engine-management.git"]
 	path = docs/submodules/holmes/engine-management.git
 	url = ../holmes/engine-management
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/vfc/nfvo/lcm.git"]
 	path = docs/submodules/vfc/nfvo/lcm.git
 	url = ../vfc/nfvo/lcm
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/msb/apigateway.git"]
 	path = docs/submodules/msb/apigateway.git
 	url = ../msb/apigateway
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/msb/discovery.git"]
 	path = docs/submodules/msb/discovery.git
 	url = ../msb/discovery
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/msb/java-sdk.git"]
 	path = docs/submodules/msb/java-sdk.git
 	url = ../msb/java-sdk
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/msb/swagger-sdk.git"]
 	path = docs/submodules/msb/swagger-sdk.git
 	url = ../msb/swagger-sdk
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/modeling/modelspec.git"]
 	path = docs/submodules/modeling/modelspec.git
 	url = ../modeling/modelspec
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/dmaap/messagerouter/messageservice.git"]
 	path = docs/submodules/dmaap/messagerouter/messageservice.git
 	url = ../dmaap/messagerouter/messageservice
@@ -91,15 +106,25 @@
 [submodule "docs/submodules/aai/esr-server.git"]
 	path = docs/submodules/aai/esr-server.git
 	url = ../aai/esr-server
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/oom.git"]
 	path = docs/submodules/oom.git
 	url = ../oom
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/aai/aai-common.git"]
 	path = docs/submodules/aai/aai-common.git
 	url = ../aai/aai-common
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/aai/resources.git"]
 	path = docs/submodules/aai/resources.git
 	url = ../aai/resources
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/aai/traversal.git"]
 	path = docs/submodules/aai/traversal.git
 	url = ../aai/traversal
+	branch = .
+	ignore = dirty
diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst
index 01e2d8042..1125fcdc7 100644
--- a/docs/release/repolist.rst
+++ b/docs/release/repolist.rst
@@ -12,31 +12,31 @@ Documentation organized by the project delivering them.
 .. toctree::
    :maxdepth: 1
    :titlesonly:
-   
-   appc <../submodules/appc.git/docs/index>
+
+   aaf/authz <../submodules/aaf/authz.git/docs/index>
+   aai/aai-common <../submodules/aai/aai-common.git/docs/index>
+   aai/esr-server <../submodules/aai/esr-server.git/docs/index>
+   aai/resources <../submodules/aai/resources.git/docs/index>
+   aai/search-data-service <../submodules/aai/search-data-service.git/docs/index>
+   aai/traversal <../submodules/aai/traversal.git/docs/index>
    appc/deployment <../submodules/appc/deployment.git/docs/index>
+   appc <../submodules/appc.git/docs/index>
    clamp <../submodules/clamp.git/docs/index>
    cli <../submodules/cli.git/docs/index>
-   vnfrqts/guidelines <../submodules/vnfrqts/guidelines.git/docs/index>
-   vnfrqts/requirements <../submodules/vnfrqts/requirements.git/docs/index>
-   aai/search-data-service <../submodules/aai/search-data-service.git/docs/index>
-   Optimization Framework: Homing and Allocation <../submodules/optf/has.git/docs/index>
    dcaegen2 <../submodules/dcaegen2.git/docs/index>
-   aaf/authz <../submodules/aaf/authz.git/docs/index>
-   policy/engine <../submodules/policy/engine.git/docs/index>
-   vfc/nfvo/lcm <../submodules/vfc/lcm.git/docs/index>
-   vnfsdk/model <../submodules/vnfsdk/model.git/docs/index>
-   holmes/rule-management <../submodules/holmes/rule-management.git/docs/index>
+   dmaap/messagerouter/messageservice <../submodules/dmaap/messagerouter/messageservice.git/docs/index>
    holmes/engine-management <../submodules/holmes/engine-management.git/docs/index>
-   vfc/nfvo/lcm <../submodules/vfc/nfvo/lcm.git/docs/index>
+   holmes/rule-management <../submodules/holmes/rule-management.git/docs/index>
+   modeling/modelspec <../submodules/modeling/modelspec.git/docs/index>
    msb/apigateway <../submodules/msb/apigateway.git/docs/index>
    msb/discovery <../submodules/msb/discovery.git/docs/index>
    msb/java-sdk <../submodules/msb/java-sdk.git/docs/index>
    msb/swagger-sdk <../submodules/msb/swagger-sdk.git/docs/index>
-   modeling/modelspec <../submodules/modeling/modelspec.git/docs/index>
-   dmaap/messagerouter/messageservice <../submodules/dmaap/messagerouter/messageservice.git/docs/index>
-   aai/esr-server <../submodules/aai/esr-server.git/docs/index>
    oom <../submodules/oom.git/docs/index>
-   aai/aai-common <../submodules/aai/aai-common.git/docs/index>
-   aai/resources <../submodules/aai/resources.git/docs/index>
-   aai/traversal <../submodules/aai/traversal.git/docs/index>
+   Optimization Framework: Homing and Allocation <../submodules/optf/has.git/docs/index>
+   policy/engine <../submodules/policy/engine.git/docs/index>
+   vfc/nfvo/lcm <../submodules/vfc/lcm.git/docs/index>
+   vfc/nfvo/lcm <../submodules/vfc/nfvo/lcm.git/docs/index>
+   vnfrqts/guidelines <../submodules/vnfrqts/guidelines.git/docs/index>
+   vnfrqts/requirements <../submodules/vnfrqts/requirements.git/docs/index>
+   vnfsdk/model <../submodules/vnfsdk/model.git/docs/index>
diff --git a/docs/submodules/modeling/modelspec.git b/docs/submodules/modeling/modelspec.git
-Subproject fa2d7c391ff2982d580bf34b876c51bddbe6532
+Subproject fbc78ae725bd64fceb5d6acdaaeb2ad5c6f54e5