Prepare master for dublin branch

Include all properties on git module reference
Complete the modeling/genericparser integration
Increase build threads

Change-Id: I8b103a1a80962e13597c5e5af03f327daf437efc
Issue-ID: DOC-467
Signed-off-by: Rich Bennett <rb2745@att.com>

diff --git a/.gitmodules b/.gitmodules
index f0beb77..f5c37bb 100644 (file)
--- 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 c7e4cd8..df0595c 100644 (file)
--- 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 (submodule)
index 0000000..b1e1628
--- /dev/null
+++ b/docs/submodules/modeling/genericparser.git
@@ -0,0 +1 @@
+Subproject commit b1e1628d0c17544db64a37f7da89763aa676d3cd

diff --git a/tox.ini b/tox.ini
index 8921c36..d1bbd48 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -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