summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@est.tech>2019-09-10 13:48:43 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-10 13:48:43 +0000
commitfba0011822b48126ff82846a2c28937d8dc98553 (patch)
tree4b8058e8ff938f1f32e647fb2afe56b9bdc751ff
parent2b23b1f4863a8d915fd4f5d7be300e9086d16494 (diff)
parent4cc3e8874ccf55312b8dd2d9d8a8c158862f4af7 (diff)
Merge "DOC - Fixing doc linking issue"
-rw-r--r--.gitmodules10
-rw-r--r--docs/release/repolist.rst2
m---------docs/submodules/modeling/etsicatalog.git0
m---------docs/submodules/modeling/genericparser.git0
-rw-r--r--tox.ini2
5 files changed, 7 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules
index 5193b049f..ed846d4f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -358,13 +358,13 @@
url = ../policy/parent
branch = .
ignore = dirty
-[submodule "docs/submodules/modeling/genericparser.git"]
- path = docs/submodules/modeling/genericparser.git
- url = ../modeling/genericparser
- branch = .
- ignore = dirty
[submodule "docs/submodules/osa.git"]
path = docs/submodules/osa.git
url = ../osa
branch = master
ignore = dirty
+[submodule "docs/submodules/modeling/etsicatalog.git"]
+ path = docs/submodules/modeling/etsicatalog.git
+ url = ../modeling/etsicatalog
+ branch = master
+ ignore = dirty
diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst
index 9f59f0027..30d94005b 100644
--- a/docs/release/repolist.rst
+++ b/docs/release/repolist.rst
@@ -93,4 +93,4 @@ Project/Components
oom/offline-installer <../submodules/oom/offline-installer.git/docs/index>
ccsdk/features <../submodules/ccsdk/features.git/docs/index>
parent <../submodules/parent.git/docs/index>
- modeling/genericparser <../submodules/modeling/genericparser.git/docs/index>
+ modeling/etsicatalog <../submodules/modeling/etsicatalog.git/docs/index>
diff --git a/docs/submodules/modeling/etsicatalog.git b/docs/submodules/modeling/etsicatalog.git
new file mode 160000
+Subproject 5fd2ae6a4517980ce0f89247bb354220748ae67
diff --git a/docs/submodules/modeling/genericparser.git b/docs/submodules/modeling/genericparser.git
deleted file mode 160000
-Subproject 05947d61cb8643ab41a394154ea8b73f12fb32f
diff --git a/tox.ini b/tox.ini
index d1bbd48b3..17195d4ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ whitelist_externals =
[testenv:local]
deps = -r{toxinidir}/etc/requirements.txt
commands =
- git submodule update --depth 1 --init
+ git submodule update --depth 100 --init
sphinx-build -j 4 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
echo "Generated docs available in {toxinidir}/docs/_build/html"
whitelist_externals =