From: Gregory Glover <gg2147@att.com>
Date: Thu, 16 Nov 2017 11:11:46 +0000 (+0000)
Subject: Merge "Add documentation submodule for vvp product"
X-Git-Tag: 1.0.0-Amsterdam~122
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f46da6dac70ae0234f09e70dc1a18c49dfc282dc;hp=-c;p=doc.git

Merge "Add documentation submodule for vvp product"
---

f46da6dac70ae0234f09e70dc1a18c49dfc282dc
diff --combined .gitmodules
index c58954b56,b14a0cda9..fc7cd0713
--- a/.gitmodules
+++ b/.gitmodules
@@@ -163,6 -163,11 +163,6 @@@
  	url = ../ccsdk/platform/plugins
  	branch = .
  	ignore = dirty
 -[submodule "docs/submodules/ccsdk/sli/adaptors.git"]
 -	path = docs/submodules/ccsdk/sli/adaptors.git
 -	url = ../ccsdk/sli/adaptors
 -	branch = .
 -	ignore = dirty
  [submodule "docs/submodules/ccsdk/sli/core.git"]
  	path = docs/submodules/ccsdk/sli/core.git
  	url = ../ccsdk/sli/core
@@@ -173,6 -178,11 +173,6 @@@
  	url = ../ccsdk/sli/northbound
  	branch = .
  	ignore = dirty
 -[submodule "docs/submodules/ccsdk/sli/plugins.git"]
 -	path = docs/submodules/ccsdk/sli/plugins.git
 -	url = ../ccsdk/sli/plugins
 -	branch = .
 -	ignore = dirty
  [submodule "docs/submodules/ccsdk/storage/esaas.git"]
  	path = docs/submodules/ccsdk/storage/esaas.git
  	url = ../ccsdk/storage/esaas
@@@ -188,16 -198,46 +188,16 @@@
  	url = ../ccsdk/utils
  	branch = .
  	ignore = dirty
 -[submodule "docs/submodules/sdnc/adaptors.git"]
 -	path = docs/submodules/sdnc/adaptors.git
 -	url = ../sdnc/adaptors
 -	branch = .
 -	ignore = dirty
 -[submodule "docs/submodules/sdnc/architecture.git"]
 -	path = docs/submodules/sdnc/architecture.git
 -	url = ../sdnc/architecture
 -	branch = .
 -	ignore = dirty
  [submodule "docs/submodules/sdnc/core.git"]
  	path = docs/submodules/sdnc/core.git
  	url = ../sdnc/core
  	branch = .
  	ignore = dirty
 -[submodule "docs/submodules/sdnc/features.git"]
 -	path = docs/submodules/sdnc/features.git
 -	url = ../sdnc/features
 -	branch = .
 -	ignore = dirty
 -[submodule "docs/submodules/sdnc/northbound.git"]
 -	path = docs/submodules/sdnc/northbound.git
 -	url = ../sdnc/northbound
 -	branch = .
 -	ignore = dirty
  [submodule "docs/submodules/sdnc/oam.git"]
  	path = docs/submodules/sdnc/oam.git
  	url = ../sdnc/oam
  	branch = .
  	ignore = dirty
 -[submodule "docs/submodules/sdnc/parent.git"]
 -	path = docs/submodules/sdnc/parent.git
 -	url = ../sdnc/parent
 -	branch = .
 -	ignore = dirty
 -[submodule "docs/submodules/sdnc/plugins.git"]
 -	path = docs/submodules/sdnc/plugins.git
 -	url = ../sdnc/plugins
 -	branch = .
 -	ignore = dirty
  [submodule "docs/submodules/portal.git"]
  	path = docs/submodules/portal.git
  	url = ../portal
@@@ -273,3 -313,8 +273,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