From: Joseph Keenan <joseph.keenan@est.tech>
Date: Fri, 17 Jun 2022 10:25:36 +0000 (+0000)
Subject: Merge "Fix release notes"
X-Git-Tag: 3.1.0~99
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a00dd467e73f321a5415b3f68b434134b28e5718;hp=44d933db05217eac411eec4972a0d7c880cf5c4e;p=cps.git

Merge "Fix release notes"
---

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index a584b580a..58dc060bb 100755
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -12,12 +12,16 @@ CPS Release Notes
     :depth: 2
 ..
 
-..      ========================
-..      * * *   JAKARTA   * * *
-..      ========================
+..      ====================
+..      * * *   KOHN   * * *
+..      ====================
+
+Version: 3.1.0 (not released yet)
+=================================
+
+Release Data
+------------
 
-Version: 3.1.0
-==============
 +--------------------------------------+--------------------------------------------------------+
 | **CPS Project**                      |                                                        |
 |                                      |                                                        |
@@ -25,10 +29,10 @@ Version: 3.1.0
 | **Docker images**                    | onap/cps-and-ncmp:3.1.0                                |
 |                                      |                                                        |
 +--------------------------------------+--------------------------------------------------------+
-| **Release designation**              | 3.1.0 Jakarta                                          |
+| **Release designation**              | 3.1.0 Kohn                                             |
 |                                      |                                                        |
 +--------------------------------------+--------------------------------------------------------+
-| **Release date**                     |                                                        |
+| **Release date**                     | N/A                                                    |
 |                                      |                                                        |
 +--------------------------------------+--------------------------------------------------------+
 
@@ -36,6 +40,34 @@ Features
 --------
    - `CPS-322 <https://jira.onap.org/browse/CPS-322>`_  Implement additional validation for names and identifiers
 
+..      ========================
+..      * * *   JAKARTA   * * *
+..      ========================
+
+Version: 3.0.1
+==============
+
+Release Data
+------------
+
++--------------------------------------+--------------------------------------------------------+
+| **CPS Project**                      |                                                        |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Docker images**                    | onap/cps-and-ncmp:3.0.1                                |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Release designation**              | 3.0.1 Jakarta                                          |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Release date**                     | 2022 April 28                                          |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+
+Bug Fixes
+---------
+   - `CPS-961 <https://jira.onap.org/browse/CPS-961>`_  Updated ANTLR compiler version to 4.9.2 to be compatible with runtime version
+
 Version: 3.0.0
 ==============