From: Gregory Glover <gg2147@att.com>
Date: Thu, 26 Oct 2017 11:45:49 +0000 (+0000)
Subject: Merge "Remove aai submodules aggregated in aai-common"
X-Git-Tag: 1.0.0-Amsterdam~944
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ea7c0df2873f9a8dec70ba976c76a0d636fa91a6;hp=a90b85552db233bf6ae4e673fe6e21e20799a3ae;p=doc.git

Merge "Remove aai submodules aggregated in aai-common"
---

diff --git a/.gitmodules b/.gitmodules
index 26aaaa141..d498ac155 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,11 +28,6 @@
 	url = ../appc/deployment
         branch = .
         ignore = dirty
-[submodule "docs/submodules/aai/search-data-service.git"]
-	path = docs/submodules/aai/search-data-service.git
-	url = ../aai/search-data-service
-        branch = .
-        ignore = dirty
 [submodule "docs/submodules/optf/has.git"]
 	path = docs/submodules/optf/has.git
 	url = ../optf/has
@@ -118,26 +113,11 @@
 	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
 [submodule "docs/submodules/aai/esr-gui.git"]
 	path = docs/submodules/aai/esr-gui.git
 	url = ../aai/esr-gui
 	branch = .
 	ignore = dirty
-[submodule "docs/submodules/aai/data-router.git"]
-	path = docs/submodules/aai/data-router.git
-	url = ../aai/data-router
-	branch = .
-	ignore = dirty
 [submodule "docs/submodules/aai/sparky-fe.git"]
 	path = docs/submodules/aai/sparky-fe.git
 	url = ../aai/sparky-fe
@@ -326,6 +306,10 @@
 [submodule "docs/submodules/so/libs.git"]
 	path = docs/submodules/so/libs.git
 	url = ../so/libs
+	branch = .
+	ignore = dirty
 [submodule "docs/submodules/logging-analytics.git"]
 	path = docs/submodules/logging-analytics.git
 	url = ../logging-analytics
+	branch = .
+	ignore = dirty
diff --git a/docs/conf.py b/docs/conf.py
index ac9edb47e..791569eb5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -95,6 +95,7 @@ language = None
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = [
+	'submodules/aai/aai-common.git/docs/platform/offeredapis.rst',
 	'_build' 
 	]
 
diff --git a/docs/submodules/aai/data-router.git b/docs/submodules/aai/data-router.git
deleted file mode 160000
index b20f57f64..000000000
--- a/docs/submodules/aai/data-router.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b20f57f64d421d35c065abdbdae7695fa85436ce
diff --git a/docs/submodules/aai/resources.git b/docs/submodules/aai/resources.git
deleted file mode 160000
index f8dcbd30a..000000000
--- a/docs/submodules/aai/resources.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f8dcbd30afefaa5d87a9056a67131bf8d42eb1f1
diff --git a/docs/submodules/aai/search-data-service.git b/docs/submodules/aai/search-data-service.git
deleted file mode 160000
index 28d7cc4dd..000000000
--- a/docs/submodules/aai/search-data-service.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 28d7cc4dd0b058c3a6dc354dfea01bac7cbb5b88
diff --git a/docs/submodules/aai/traversal.git b/docs/submodules/aai/traversal.git
deleted file mode 160000
index c23d2a134..000000000
--- a/docs/submodules/aai/traversal.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c23d2a134fcbd9671d5f45b8fdc364271203963a