Merge "Document Security section of the Release Notes"

1 files changed, 62 insertions, 57 deletions

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 2573c2ca02..57a1fab997 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -8,66 +8,10 @@
 Release Notes
 =============
 
-Version: 1.1.0
---------------
-
-:Release Date: 2017-11-16
-
-**New Features**
-
-The Amsterdam release is the first release of the ONAP Operations Manager (OOM).
-
-The main goal of the Amsterdam release was to:
-
-    - Support Flexible Platform Deployment via Kubernetes of fully containerized OMAP components - on any type of environment.
-    - Support State Management of ONAP platform components.
-    - Support full production ONAP deployment and any variation of component level deployment for development.
-    - Platform Operations Orchestration / Control Loop Actions.
-    - Platform centralized logging with ELK stack.
-
-**Bug Fixes**
-
-    The full list of implemented user stories and epics is available on `JIRA <https://jira.onap.org/secure/RapidBoard.jspa?rapidView=41&view=planning.nodetail&epics=visible>`_
-    This is the first release of OOM, the defects fixed in this release were raised during the course of the release.
-    Anything not closed is captured below under Known Issues. If you want to review the defects fixed in the Amsterdam release, refer to Jira link above.
-
-**Known Issues**
-    - `OOM-6 <https://jira.onap.org/browse/OOM-6>`_ Automated platform deployment on Docker/Kubernetes
-
-        VFC, AAF, MSB minor issues.
-
-        Workaround: Manual configuration changes - however the reference vFirewall use case does not currently require these components.
-
-    - `OOM-10 <https://jira.onap.org/browse/OOM-10>`_ Platform configuration management.
-
-        OOM ONAP Configuration Management - Handling of Secrets.
-
-        Workaround: Automated workaround to be able to pull from protected docker repositories.
-
-
-**Security Issues**
-    N/A
-
-
-**Upgrade Notes**
-
-    N/A
-
-**Deprecation Notes**
-
-    N/A
-
-**Other**
-
-
-
-===========
-
-
 Version 2.0.0 Beijing Release
 -----------------------------
 
-:Release Date: 2018-05-24
+:Release Date: 2018-06-07
 
 Epic
 ****
@@ -444,5 +388,66 @@ Sub-task
 * [`OOM-1036 <https://jira.onap.org/browse/OOM-1036>`_] - update helm from 2.7.2 to 2.8.2 wiki/rtd
 * [`OOM-1063 <https://jira.onap.org/browse/OOM-1063>`_] - Document Portal LoadBalancer Ingress IP Settings
 
+**Security Notes**
+
+OOM code has been formally scanned during build time using NexusIQ and no Critical vulnerability was found.
+
+Quick Links:
+ 	- `OOM project page <https://wiki.onap.org/display/DW/ONAP+Operations+Manager+Project>`_
+
+ 	- `Passing Badge information for OOM <https://bestpractices.coreinfrastructure.org/en/projects/1631>`_
+
+Version: 1.1.0
+--------------
+
+:Release Date: 2017-11-16
+
+**New Features**
+
+The Amsterdam release is the first release of the ONAP Operations Manager (OOM).
+
+The main goal of the Amsterdam release was to:
+
+    - Support Flexible Platform Deployment via Kubernetes of fully containerized OMAP components - on any type of environment.
+    - Support State Management of ONAP platform components.
+    - Support full production ONAP deployment and any variation of component level deployment for development.
+    - Platform Operations Orchestration / Control Loop Actions.
+    - Platform centralized logging with ELK stack.
+
+**Bug Fixes**
+
+    The full list of implemented user stories and epics is available on `JIRA <https://jira.onap.org/secure/RapidBoard.jspa?rapidView=41&view=planning.nodetail&epics=visible>`_
+    This is the first release of OOM, the defects fixed in this release were raised during the course of the release.
+    Anything not closed is captured below under Known Issues. If you want to review the defects fixed in the Amsterdam release, refer to Jira link above.
+
+**Known Issues**
+    - `OOM-6 <https://jira.onap.org/browse/OOM-6>`_ Automated platform deployment on Docker/Kubernetes
+
+        VFC, AAF, MSB minor issues.
+
+        Workaround: Manual configuration changes - however the reference vFirewall use case does not currently require these components.
+
+    - `OOM-10 <https://jira.onap.org/browse/OOM-10>`_ Platform configuration management.
+
+        OOM ONAP Configuration Management - Handling of Secrets.
+
+        Workaround: Automated workaround to be able to pull from protected docker repositories.
+
+
+**Security Issues**
+    N/A
+
+
+**Upgrade Notes**
+
+    N/A
+
+**Deprecation Notes**
+
+    N/A
+
+**Other**
+
+    N/A
 
 End of Release Notes