From: Gervais-Martial Ngueko <gervais-martial.ngueko@intl.att.com>
Date: Thu, 28 May 2020 15:55:01 +0000 (+0000)
Subject: Merge "Fix crash at SDC deploy"
X-Git-Tag: 5.1.0~46
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3678b0597342a68c8d41c19914560153ba0365a0;hp=badc1b5e02d60e15d08e231883cf74d2a28d92e1;p=clamp.git

Merge "Fix crash at SDC deploy"
---

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index b4269664..1b56378e 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -6,8 +6,8 @@
 Release Notes
 =============
 
-Version: 5.0.1
---------------
+Version: 5.0.1 (Frankfurt)
+--------------------------
 
 :Release Date: 2020-05-12
 
@@ -30,9 +30,10 @@ The main goal of the Frankfurt release was to:
 **Bug Fixes**
 
 	- The full list of implemented user stories and epics is available on `Frankfurt CLAMP M1 release planning <https://wiki.onap.org/display/DW/CLAMP+R6+-+M1+Release+Planning>`_
-	  
+	- The full list of issues(bugs) solved, is available on `CLAMP R6 - Frankfurt list of solved issues(bugs) <https://wiki.onap.org/pages/viewpage.action?pageId=84648915>`_
 
 **Known Issues**
+    - `CLAMP-856 <https://jira.onap.org/browse/CLAMP-856>`_ CLAMP should not display all CDS workflow properties
 
 
 **Security Notes**
@@ -52,17 +53,18 @@ Quick Links:
 
 **Upgrade Notes**
 
-    New Docker Containers are available. the list of containers composing this release are below:
-    - clamp-backend-filebeat-onap: docker.elastic.co/beats/filebeat 5.5.0
-    - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.0.6
-    - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.0.6
-    - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.3
-    - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.3
-    - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.3
+    - The Upgrade strategy for Frankfurt can be found here:`<https://wiki.onap.org/display/DW/Frankfurt+CLAMP+Container+upgrade+strategy>`_
+    - New Docker Containers are available. the list of containers composing this release are below:
+      - clamp-backend-filebeat-onap: docker.elastic.co/beats/filebeat 5.5.0
+      - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.0.6
+      - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.0.6
+      - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.3
+      - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.3
+      - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.3
 
 
-Version: 4.1.3
---------------
+Version: 4.1.3 (El-Alto)
+------------------------
 
 :Release Date: 2019-10-11
 
@@ -109,8 +111,8 @@ Quick Links:
     New Docker Containers are available.
 
 
-Version: 4.1.0
---------------
+Version: 4.1.0 (El-Alto Early Drop)
+-----------------------------------
 
 :Release Date: 2019-08-19
 
@@ -157,8 +159,8 @@ Quick Links:
 
 
 
-Version: 4.0.5
---------------
+Version: 4.0.5 (Dublin)
+-----------------------
 
 :Release Date: 2019-06-06
 
@@ -240,8 +242,8 @@ none
 one documentation issue was fixed, this issue does not require a new docker image:
     - `CLAMP-257 <https://jira.onap.org/browse/CLAMP-257>`_ User Manual for CLAMP : nothing on readthedocs.
 
-Version: 3.0.3
---------------
+Version: 3.0.3 (Casablanca)
+---------------------------
 
 :Release Date: 2018-11-30
 
@@ -296,8 +298,8 @@ Quick Links:
 
     https://wiki.onap.org/display/DW/CLAMP+videos
 
-Version: 2.0.2
---------------
+Version: 2.0.2 (Beijing)
+------------------------
 
 :Release Date: 2018-06-07
 
@@ -352,8 +354,8 @@ Quick Links:
 
     CLAMP Dashboard is now implemented, allows to monitor Closed Loops that are running by retrieving CL events on DMAAP.
 
-Version: 1.1.0
---------------
+Version: 1.1.0 (Amsterdam)
+--------------------------
 
 :Release Date: 2017-11-16