summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules5
-rw-r--r--docs/conf.py4
m---------docs/submodules/modeling/modelspec.git0
m---------docs/submodules/sdc.git0
m---------docs/submodules/vfc/nfvo/lcm.git0
m---------docs/submodules/vvp/documentation.git0
6 files changed, 7 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index d26fcafbd..5ea3cb147 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -263,3 +263,8 @@
url = ../modeling/toscaparsers
branch = .
ignore = dirty
+[submodule "docs/submodules/vvp/documentation.git"]
+ path = docs/submodules/vvp/documentation.git
+ url = ../vvp/documentation
+ branch = .
+ ignore = dirty
diff --git a/docs/conf.py b/docs/conf.py
index f8bc45863..d6c6b0384 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,9 +73,9 @@ author = u'Open Network Automation Platform'
# |version| and |release|, also used in various other places throughout the
# built documents.
# The short X.Y version.
-version = '1.0.0'
+version = 'master branch'
# The full version, including alpha/beta/rc tags.
-release = 'Amsterdam'
+release = 'master branch'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/docs/submodules/modeling/modelspec.git b/docs/submodules/modeling/modelspec.git
-Subproject f65a5ceeedb8dbce21817571128310b4740d453
+Subproject 05ee6b88ab15373a6212753f989bbafb55984d9
diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
-Subproject 49f1676efc2efe8d9e153a61afa692607cb526d
+Subproject 0566f581c0f310384f42838c388f57234ed1d60
diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git
-Subproject 321644e68718242586be3677624bea1c649af87
+Subproject 0005a63e02f4afc36d013ca53feaea7073cd9e0
diff --git a/docs/submodules/vvp/documentation.git b/docs/submodules/vvp/documentation.git
-Subproject d3169add2377f8ab1d883cf2e9e3b3f7e9b5eeb
+Subproject 0ca827db0fd2cee74377c844175c0df0037f4ac