Merge "Release Docker image 1.1.0 of Enrichment Service"

diff --git a/.releases/container-release-nonrtric-policy-agent.yaml b/.releases/container-release-nonrtric-policy-agent.yaml
index a80747d..d1b596b 100644 (file)
--- a/.releases/container-release-nonrtric-policy-agent.yaml
+++ b/.releases/container-release-nonrtric-policy-agent.yaml
@@ -1,10 +1,10 @@
 ---
 distribution_type: container
-container_release_tag: 2.1.0
+container_release_tag: 2.2.0
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: nonrtric
-ref: 90ce16238dd6970153e1c0fbddb15e32c68c504f
+ref: d6624171da70a1c71e3d5b8263855fabf613a06e
 containers:
     - name: nonrtric-policy-agent
-      version: 2.1.0
\ No newline at end of file
+      version: 2.2.0

diff --git a/.releases/maven-release-nonrtric-policy-agent.yaml b/.releases/maven-release-nonrtric-policy-agent.yaml
index ea1c134..167156a 100644 (file)
--- a/.releases/maven-release-nonrtric-policy-agent.yaml
+++ b/.releases/maven-release-nonrtric-policy-agent.yaml
@@ -1,5 +1,5 @@
 ---
 distribution_type: maven
-version: 2.1.0
+version: 2.2.0
 project: nonrtric-policy-agent
-log_dir: nonrtric-policy-agent-maven-stage-master/188/
\ No newline at end of file
+log_dir: nonrtric-policy-agent-maven-stage-master/387/

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index b09dcfb..98db6f1 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -10,12 +10,12 @@ Release-Notes
 This document provides the release notes for the release of the different parts of the Non-RT RIC.
 
 .. contents::
-   :depth: 3
+   :depth: 1
    :local:
 
 
-Version history A1 Policy Management Service
-============================================
+Version history A1 Policy Agent
+===============================
 
 +------------+----------+------------------+--------------------+
 | **Date**   | **Ver.** | **Author**       | **Comment**        |
@@ -35,11 +35,9 @@ Version history A1 Policy Management Service
 | 2020-12-03 | 2.1.0    | Henrik Andersson | Cherry Release     |
 |            |          |                  |                    |
 +------------+----------+------------------+--------------------+
-
-
-Summary
--------
-Introduction of Enrichment Service Coordinator and rAPP Catalogue.
+| 2021-06-23 | 2.2.0    | Henrik Andersson | D Release          |
+|            |          |                  |                    |
++------------+----------+------------------+--------------------+
 
 
 Version history SDNC A1 Controller
@@ -67,44 +65,6 @@ Version history SDNC A1 Controller
 Release Data
 ============
 
-Amber
------
-+-----------------------------+---------------------------------------------------+
-| **Project**                 | Non-RT RIC                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Repo/commit-ID**          | nonrtric/ec3829493c0b71c5e5908a430edd1e493504178e |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release designation**     | Amber                                             |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release date**            | 2019-11-22                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Purpose of the delivery** | Introducing Non-RT RIC                            |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-
-Amber Maintenance
------------------
-+-----------------------------+---------------------------------------------------+
-| **Project**                 | Non-RT RIC                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Repo/commit-ID**          | nonrtric/08691d2192981c302a5528669fdb71e48cb3dcbc |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release designation**     | Amber Maintenance Release                         |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Release date**            | 2020-02-03                                        |
-|                             |                                                   |
-+-----------------------------+---------------------------------------------------+
-| **Purpose of the delivery** | Introducing Policy Agent and                      |
-|                             | updating to latest A1 spec                        |
-+-----------------------------+---------------------------------------------------+
-
 Bronze
 ------
 +-----------------------------+---------------------------------------------------+
@@ -162,3 +122,22 @@ Cherry
 |                             | and rAPP Catalogue                                |
 |                             |                                                   |
 +-----------------------------+---------------------------------------------------+
+
+D
+-
++-----------------------------+---------------------------------------------------+
+| **Project**                 | Non-RT RIC                                        |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Repo/commit-ID**          | nonrtric/d6624171da70a1c71e3d5b8263855fabf613a06e |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release designation**     | D                                                 |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Release date**            | 2021-06-23                                        |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+
+| **Purpose of the delivery** | Improvements                                      |
+|                             |                                                   |
++-----------------------------+---------------------------------------------------+