Add git submodule for openretriever

TODO: there is recursive dependency between opnvdocs and docs in openretrive.
submodules in openretriever will be updated in docs/featureprojects.rst after
https://gerrit.opnfv.org/gerrit/#/c/28583/ was merged.

Change-Id: I21dd160d42cbf9d5938a70b10b66390ff031ffe8
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>

diff --git a/.gitmodules b/.gitmodules
index fa60a71..c428ebf 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -187,3 +187,8 @@
        url = ../barometer
        branch = .
        ignore = dirty
+[submodule "docs/submodules/openretriever"]
+       path = docs/submodules/openretriever
+       url = https://gerrit.opnfv.org/gerrit/openretriever
+       branch = .
+       ignore = dirty

diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst
index a9ec17d..8e26ea6 100644 (file)
--- a/docs/featureprojects.rst
+++ b/docs/featureprojects.rst
@@ -440,6 +440,7 @@ Snaps
 .. toctree::
    :maxdepth: 1
 
+<<<<<<< HEAD
    ../submodules/snaps/docs/development/overview/index
    ../submodules/snaps/docs/development/requirements/index
    ../submodules/snaps/docs/release/installation/index
@@ -519,3 +520,8 @@ Yardstick
    ../submodules/yardstick/docs/development/manuals/index
 
 
+=======
+   ../submodules/sfc/docs/userguide/index
+   ../submodules/sfc/docs/releasenotes/index
+   ../submodules/sfc/docs/installationprocedure/index
+>>>>>>> 88a5b11... Add git submodule for openretriever