summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2018-08-14 14:10:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-14 14:10:14 +0000
commitc3e279a27e0f4bbc77a8dadcec3d6c06395b9711 (patch)
tree0412030e192288132eb3fbf7798b3c493aab5a26
parent5490e32fabdd0823ed81624944c96e1241db18cc (diff)
parenta2c88f5a3ea5b2bff932968c6fb0c0460c6a4291 (diff)
Merge "Add edgecloud project to featureproject"
-rw-r--r--.gitmodules4
-rw-r--r--docs/featureprojects.rst6
m---------docs/submodules/edgecloud0
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 119998fee..4d6455b5f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -252,4 +252,6 @@
ignore = dirty
[submodule "docs/submodules/edgecloud"]
path = docs/submodules/edgecloud
- url = https://gerrit.opnfv.org/gerrit/edgecloud
+ url = ../edgecloud
+ branch = .
+ ignore = dirty
diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst
index 2f6340baf..d5afec867 100644
--- a/docs/featureprojects.rst
+++ b/docs/featureprojects.rst
@@ -103,6 +103,12 @@ Doctor
../submodules/doctor/docs/development/design/index
../submodules/doctor/docs/development/manuals/index
+Edgecloud
+---------
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/edgecloud/docs/development/requirements/index
IPV6
----
diff --git a/docs/submodules/edgecloud b/docs/submodules/edgecloud
-Subproject 9d8195c417981868fb35a43608cc885cad9bab8
+Subproject 3821e7480016b380e02e74026fc1c15ed743546