Merge "[DMAAP-BC] Fix jjb failure"

diff --git a/.gitreview b/.gitreview
new file mode 100644 (file)
index 0000000..1b82e85
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.onap.org
+port=29418
+project=dmaap/buscontroller.git

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d35b9a2..6360816 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -97,11 +97,9 @@ Honolulu
 ========
 
 
-
 Abstract
 --------
 
-
 This document provides the release notes for the Honolulu release.
 
 
@@ -357,7 +355,7 @@ El Alto
 Version: 1.1.5 
 --------------
 
-: Release Date: 2019-06-06 (El Alto)
+:Release Date: 2019-06-06 (El Alto)
 
 **New Features**
 
@@ -387,10 +385,13 @@ Quick Links:
        NA
        
 
+Dublin
+======
 
-Version: 1.1.5 (Dublin)
------------------------
-: Release Date: 2019-06-06
+Version: 1.1.5
+--------------
+
+:Release Date: 2019-06-06
 
 **New Features**
 
@@ -419,9 +420,13 @@ NA
 **Deprecation Notes**
 
 
+Casablanca
+==========
+
 Version: 1.0.23
 ---------------
-: Release Date: 2018-10-18
+
+:Release Date: 2018-10-18
 
 **New Features**
 

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 59387aa..74a3b7a 100644 (file)
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,15 +1 @@
-tox
-Sphinx==4.2.0
-doc8
-docutils
-setuptools
-six
-lfdocs-conf~=0.7.5
-funcparserlib~=1.0.0a0
-sphinxcontrib.blockdiag~=2.0.0
-sphinxcontrib-needs<0.6.0
-sphinxcontrib.plantuml~=0.21
-sphinxcontrib.nwdiag~=2.0.0
-sphinxcontrib-seqdiag~=2.0.0
-sphinxcontrib-swaggerdoc~=0.1.7
-sphinx-rtd-theme~=1.0.0
\ No newline at end of file
+lfdocs-conf

diff --git a/docs/tox.ini b/docs/tox.ini
index edac8c3..42ffa68 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -5,7 +5,10 @@ skipsdist = true
 
 [testenv:docs]
 basepython = python3
-deps = -r{toxinidir}/requirements-docs.txt
+deps =
+    -r{toxinidir}/requirements-docs.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
+    -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
     echo "Generated docs available in {toxinidir}/_build/html"