Document Security section of the Release Notes
Fix the merge conflict
Change-Id: If230e10a14b2e2e7bd5247727bcc8030ce0b281b
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
index bc74dbd..3dc8ca5 100644
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -10,10 +10,7 @@
Version: 1.1.4
--------------
-
-:Release Date: 2018-05-24
-
-
+:Release Date: 2018-06-07
**New Features**
@@ -24,9 +21,14 @@
**Known Issues**
NA
-**Security Issues**
- This release fixes the security vulnerabilities due to the opensourced libraries used in the project
+**Security Notes**
+DMAAP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and determined to be false positive. The DMAAP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=28379799>`_.
+
+Quick Links:
+- `DMAAP project page <https://wiki.onap.org/display/DW/DMaaP+Planning>`_
+- `Passing Badge information for DMAAP <https://bestpractices.coreinfrastructure.org/en/projects/1751>`_
+- `Project Vulnerability Review Table for DMAAP <https://wiki.onap.org/pages/viewpage.action?pageId=28379799>`_
**Upgrade Notes**
NA
@@ -34,8 +36,9 @@
**Deprecation Notes**
Version: 1.0.1
+--------------
-Release Date: 2017-11-16
+:Release Date: 2017-11-16
New Features: