Merge "Portal El-Alto Release Note"
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index b1b0266..1fb4b86 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -5,6 +5,53 @@
Portal Platform Release Notes
=============================
+Version: 2.6.0
+--------------
+:Release Date: 2019-10-03
+
+.. toctree::
+ :maxdepth: 1
+
+Maintanance release with bug fixes and security enhancements.
+
+**No New Features**
+
+**Bug Fixes**
+ * Portal Setup - MariaDB issue.
+ * Issue editing application url.
+ * PORTAL-* charts now use nodePortPrefix variable.
+ * Fixed Sonar reported critical issues.
+
+**Known Issues**
+
+**Security Notes**
+ * Security Enhancements - Fixed OJSI issues.
+ * Addressed security issues reported by NexusIQ Critical and Severe issues
+
+Quick Links:
+ - `PORTAL project page <https://wiki.onap.org/display/DW/Portal+Platform+Project>`_
+
+ - `Passing Badge information for PORTAL <https://bestpractices.coreinfrastructure.org/en/projects/1441>`_
+
+ - `Project Vulnerability Review Table for PORTAL <https://wiki.onap.org/pages/viewpage.action?pageId=68542388>`_
+
+**Upgrade Notes**
+ * For https Apps onboarded to portal, a certificate has to be downloaded in the browser when first trying to access the landing page of the App.
+ * For onboarded Apps using http (since Portal is using https) the browser asks the user to click to Proceed to the unsafe URL.
+ * For onboarded Apps using http the icon in the URL bar will appear red, click on it and allow unsafe scripts.
+ * The first time some apps are selected in the Applications panel, an error stating the webpage might be temporarily down, copy the presented URL to a new browser; once that is done, the application will open in the Portal.
+
+**Deprecation Notes**
+
+**Other**
+ * Below are the docker images released as part of Portal Platform project:
+ * onap/portal-app:2.6.0
+ * onap/portal-db:2.6.0
+ * onap/portal-sdk:2.6.0
+ * onap/portal-wms:2.6.0
+ * portal/sdk java artifacts - (Release branch: “release-2.6.0”)
+
+
Version: 2.5.0
--------------
:Release Date: 2019-06-13