Merge "Automation adds release-notes.rst"

diff --git a/docs/index.rst b/docs/index.rst
index d6a2cde..94ba62d 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,20 +1,21 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.\r
-.. http://creativecommons.org/licenses/by/4.0\r
-.. Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
-\r
-DMaaP Data Router\r
-============================================\r
-\r
-.. toctree::\r
-   :maxdepth: 1\r
-\r
-   architecture.rst\r
-   offeredapis.rst\r
-   delivery.rst\r
-   logging.rst\r
-   installation.rst\r
-   configuration.rst\r
-   release-notes.rst\r
-\r
-\r
-\r
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+.. _master_index:
+
+DMaaP Data Router
+============================================
+
+.. toctree::
+   :maxdepth: 1
+
+   architecture.rst
+   offeredapis.rst
+   delivery.rst
+   logging.rst
+   installation.rst
+   configuration.rst
+   release-notes.rst
+
+
+

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index c98d278..780fd33 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -2,6 +2,51 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. _release_notes:
 
+
+Release-notes
+==============
+
+Version: 6.0.0 (Frankfurt)
+---------------------------
+
+:Release Date: 2020-05-14
+
+Docker Image Version: 2.1.6
+
+New Features:
+
++----------------+---------------------------------------------------------------------------------------------------------------------------------+
+| JIRA ID        | Description                                                                                                                     |
++================+=================================================================================================================================+
+| DMAAP-1152     | [DMAAP] Implement boolean flag in OOM to disable HTTP ports                                                                     |
++----------------+---------------------------------------------------------------------------------------------------------------------------------+
+| DMAAP-1320     | [DR] Dynamic cert distribution from OOM AAF                                                                                     |
++----------------+---------------------------------------------------------------------------------------------------------------------------------+
+
+Bug Fixes:
+
++----------------+--------------------------------------------------------------------------------------------------+
+| JIRA ID        | Description                                                                                      |
++================+==================================================================================================+
+| DMAAP-1420     | [DR] dr-node fails to get CN from new AAF p12 cert                                               |
++----------------+--------------------------------------------------------------------------------------------------+
+
+Known Issues:
+N/A
+
+Security Issues:
+N/A
+
+Upgrade Notes:
+N/A
+
+Deprecation Notes:
+N/A
+
+Other:
+N/A
+
+
 Release-notes
 ==============
 
@@ -10,8 +55,6 @@ Version: 2.1.2 (El Alto)
 
 :Release Date: 2019-09-05
 
-The DataRouter(DR) provisioning API is a HTTPS-based, REST-like API for creating and managing DR feeds and subscriptions.
-
 New Features:
 
 +----------------+---------------------------------------------------------------------------------------------------------------------------------+
@@ -25,7 +68,12 @@ New Features:
 +----------------+---------------------------------------------------------------------------------------------------------------------------------+
 
 Bug Fixes:
-N/A
+
++----------------+--------------------------------------------------------------------------------------------------+
+| JIRA ID        | Description                                                                                      |
++================+==================================================================================================+
+| DMAAP-1421     |  [DR] ElAlto AAF certs expired                                                                   |
++----------------+--------------------------------------------------------------------------------------------------+
 
 Known Issues:
 N/A
@@ -48,8 +96,6 @@ Version: 2.1.0 (Dublin)
 
 :Release Date: 2019-06-06
 
-The DataRouter(DR) provisioning API is a HTTPS-based, REST-like API for creating and managing DR feeds and subscriptions.
-
 New Features:
 
 +--------------+-------------------------------------------------------------------------------+
@@ -114,8 +160,6 @@ Version: 1.0.8 (Casablanca)
 
 :Release Date: 2019-02-28
 
-The DataRouter(DR) provisioning API is a HTTPS-based, REST-like API for creating and managing DR feeds and subscriptions.
-
 New Features:
 
 +--------------+------------------------------------------------------------------+
@@ -158,8 +202,6 @@ Version: 1.0.3 (Casablanca)
 
 :Release Date: 2018-11-30
 
-The DataRouter(DR) provisioning API is a HTTPS-based, REST-like API for creating and managing DR feeds and subscriptions.
-
 New Features:
 
 +--------------+------------------------------------------------------------------+