From: Gregory Glover Date: Mon, 27 Nov 2017 13:47:36 +0000 (+0000) Subject: Merge "Add explanation how to use branches" X-Git-Tag: 2.0.0-ONAP~5401 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=de642bf723536e4bd49d5f3db0cabfb341471c77;hp=2963ecebb03b42e35e31aa0bc806f8be0ef13ea6;p=doc.git Merge "Add explanation how to use branches" --- 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 index f65a5ceee..05ee6b88a 160000 --- a/docs/submodules/modeling/modelspec.git +++ b/docs/submodules/modeling/modelspec.git @@ -1 +1 @@ -Subproject commit f65a5ceeedb8dbce21817571128310b4740d4538 +Subproject commit 05ee6b88ab15373a6212753f989bbafb55984d9f diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git index 49f1676ef..0566f581c 160000 --- a/docs/submodules/sdc.git +++ b/docs/submodules/sdc.git @@ -1 +1 @@ -Subproject commit 49f1676efc2efe8d9e153a61afa692607cb526d3 +Subproject commit 0566f581c0f310384f42838c388f57234ed1d60e diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git index 321644e68..0005a63e0 160000 --- a/docs/submodules/vfc/nfvo/lcm.git +++ b/docs/submodules/vfc/nfvo/lcm.git @@ -1 +1 @@ -Subproject commit 321644e68718242586be3677624bea1c649af877 +Subproject commit 0005a63e02f4afc36d013ca53feaea7073cd9e00 diff --git a/docs/submodules/vvp/documentation.git b/docs/submodules/vvp/documentation.git index d3169add2..0ca827db0 160000 --- a/docs/submodules/vvp/documentation.git +++ b/docs/submodules/vvp/documentation.git @@ -1 +1 @@ -Subproject commit d3169add2377f8ab1d883cf2e9e3b3f7e9b5eeb9 +Subproject commit 0ca827db0fd2cee74377c844175c0df0037f4ac2