diff options
| author |   Rich Bennett <rb2745@att.com> | 2019-05-15 15:27:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-15 15:27:01 +0000 |
| commit | 98601e335f157f35dac1f3338e95c4082fe8e79c (patch) | |
| tree | 03daad4fc977cb769ba47c9aee9fdfde35862142 | |
| parent | bc0e0c916cb6963fe43e3a89ae7ed740e9559ac6 (diff) | |
| parent | de0a783bcac79760a6f91d214748c98d7e151139 (diff) | |
Merge "Prepare master for dublin branch"
| -rw-r--r-- | .gitmodules | 7 | ||||
| -rw-r--r-- | docs/release/repolist.rst | 1 | ||||
| m--------- | docs/submodules/modeling/genericparser.git | 0 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index f0beb77c7..f5c37bbdc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -396,3 +396,10 @@ [submodule "docs/submodules/policy/parent.git"] path = docs/submodules/policy/parent.git url = ../policy/parent + branch = . + ignore = dirty +[submodule "docs/submodules/modeling/genericparser.git"] + path = docs/submodules/modeling/genericparser.git + url = ../modeling/genericparser + branch = . + ignore = dirty diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst index c7e4cd892..df0595c63 100644 --- a/docs/release/repolist.rst +++ b/docs/release/repolist.rst @@ -92,3 +92,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> diff --git a/docs/submodules/modeling/genericparser.git b/docs/submodules/modeling/genericparser.git new file mode 160000 +Subproject b1e1628d0c17544db64a37f7da89763aa676d3c @@ -6,7 +6,7 @@ skipsdist = true [testenv:docs] deps = -r{toxinidir}/etc/requirements.txt commands = - sphinx-build -j 1 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html + 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 = echo |