Merge Casablanca

Issue-ID: SO-1460
Change-Id: I102ab0dddb8c26ca4001320ee8eb5b34ae9f0238
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

diff --cc docs/release-notes.rst
index 979619b,0035668..89e12e3
--- 1/docs/release-notes.rst
--- 2/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@@ -8,12 -8,102 +8,103 @@@ Service Orchestrator Release Note
  
  The SO provides the highest level of service orchestration in the ONAP architecture. 
  
- Version: 1.4.0
+ Version: 1.3.7
  --------------
  
- :Release Date: 2018-11-30
+ :Release Date: 2019-01-31
+ 
+ This is the official release package that released for the Casablanca Maintenance.
+ 
+ Casablanca Release branch
+ 
+ **New Features**
+ 
+ This release is supporting the features of Casablanca and their defect fixes.
+ - `SO-1400 <https://jira.onap.org/browse/SO-1336>`_
+ - `SO-1408 <https://jira.onap.org/browse/SO-1408>`_
+ - `SO-1416 <https://jira.onap.org/browse/SO-1416>`_
+ - `SO-1417 <https://jira.onap.org/browse/SO-1417>`_
+ 
+ **Docker Images**
+ 
+ Dockers released for SO:
+ 
+  - onap/so/api-handler-infra,1.3.7
+  - onap/so/bpmn-infra,1.3.7
+  - onap/so/catalog-db-adapter,1.3.7
+  - onap/so/openstack-adapter,1.3.7
+  - onap/so/request-db-adapter,1.3.7
+  - onap/so/sdc-controller,1.3.7
+  - onap/so/sdnc-adapter,1.3.7
+  - onap/so/so-monitoring,1.3.7
+  - onap/so/vfc-adapter,1.3.7
+ 
+ **Known Issues**
+ 
+ - `SO-1419 <https://jira.onap.org/browse/SO-1419>`_ - is a stretch goal that is under examination.
+ 
+ - `SDC-1955 <https://jira.onap.org/browse/SDC-1955>`_ - tested with a workaround to avoid this scenario. To be tested further with updated dockers of SDC, UUI and SO.
+ 
+ **Security Notes**
+ 
+       SO 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 SO open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=43385708>`_.
+ 
+       Quick Links:
+ 
+  - `SO project page <https://wiki.onap.org/display/DW/Service+Orchestrator+Project>`_
+  - `Passing Badge information for SO <https://bestpractices.coreinfrastructure.org/en/projects/1702>`_
+  - `Project Vulnerability Review Table for SO <https://wiki.onap.org/pages/viewpage.action?pageId=43385708>`_
+ 
+ 
+ Version: 1.3.6
+ --------------
+ 
+ :Release Date: 2019-01-10
+ 
+ This is the official release package that released for the Casablanca Maintenance.
+ 
+ Casablanca Release branch
+ 
+ **New Features**
+ 
+ This release is supporting the features of Casablanca and their defect fixes.
+ - `SO-1336 <https://jira.onap.org/browse/SO-1336>`_
+ - `SO-1249 <https://jira.onap.org/browse/SO-1249>`_
+ - `SO-1257 <https://jira.onap.org/browse/SO-1257>`_
+ - `SO-1258 <https://jira.onap.org/browse/SO-1258>`_
+ - `SO-1256 <https://jira.onap.org/browse/SO-1256>`_
+ - `SO-1194 <https://jira.onap.org/browse/SO-1256>`_
+ - `SO-1248 <https://jira.onap.org/browse/SO-1248>`_
+ - `SO-1184 <https://jira.onap.org/browse/SO-1184>`_
+ 
+ **Docker Images**
+ 
+ Dockers released for SO:
+ 
+  - onap/so/api-handler-infra,1.3.6
+  - onap/so/bpmn-infra,1.3.6
+  - onap/so/catalog-db-adapter,1.3.6
+  - onap/so/openstack-adapter,1.3.6
+  - onap/so/request-db-adapter,1.3.6
+  - onap/so/sdc-controller,1.3.6
+  - onap/so/sdnc-adapter,1.3.6
+  - onap/so/so-monitoring,1.3.6
+  - onap/so/vfc-adapter,1.3.6
+ 
+ **Known Issues**
+ 
+ 
+ **Security Notes**
+ 
+       SO 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 SO open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=43385708>`_.
+ 
+       Quick Links:
+ 
+  - `SO project page <https://wiki.onap.org/display/DW/Service+Orchestrator+Project>`_
+  - `Passing Badge information for SO <https://bestpractices.coreinfrastructure.org/en/projects/1702>`_
+  - `Project Vulnerability Review Table for SO <https://wiki.onap.org/pages/viewpage.action?pageId=43385708>`_
  
 +New  release over  master branch for Dublin development
  
  Version: 1.3.3
  --------------