Merge pull request #568 from wisererik/development

update release version information

README.md

@@ -8,10 +8,10 @@
 
 <img src="https://www.opensds.io/wp-content/uploads/sites/18/2016/11/logo_opensds.png" width="100">
 
-## Latest Release: v0.2.0 Aruba
-[OpenAPI doc](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.2.0/openapi-spec/swagger.yaml)
+## Latest Release: v0.4.0 Bali
+[OpenAPI doc](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.4.0/openapi-spec/swagger.yaml)
 
-[Release notes](https://github.com/opensds/opensds/releases/tag/v0.2.0)
+[Release notes](https://github.com/opensds/opensds/releases/tag/v0.4.0)
 
 ## Introduction
 

docs/readthedocs/introduction/opensds.md

@@ -34,5 +34,6 @@ now, please refer to the Contributing sections below.
 
 ### OpenAPI
 
-* [Zealand](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.1.0/openapi-spec/swagger.yaml)
+* [Bali](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.4.0/openapi-spec/swagger.yaml)
 * [Aruba](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.2.0/openapi-spec/swagger.yaml)
+* [Zealand](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/opensds/opensds/v0.1.0/openapi-spec/swagger.yaml)

docs/readthedocs/releases.rst

@@ -1,13 +1,50 @@
 Official Releases
 =================
 
+Bali
+-----
+
+The OpenSDS Bali release completed December 19, 2018.
+
+Features
+>>>>>>>>
+
+The Bali release adds the following functionality:
+
+* Introduced management of multiple OpenStack deployments
+* Multi-Cloud support
+   - S3 API support with AWS, Azure, Huawei Cloud, and local Ceph object store and Fusion Storage backends.
+   - Manual and basic policy based migration for AWS, Azure, Huawei Cloud, Ceph, and Fusion Storage.
+* Dashboard UI interface has been broken out into separately installed component and integrated with multicloud support.
+* Added ability to upload/download snapshot to/from cloud storage
+* Updated support for the Container Storage Interface (CSI) v1.0 specification
+   - Added support to create snapshot and create volume from snapshot
+   - Added support for NodeStageVolume and NodeUnstageVolume.
+* Support to provision replicated volumes using OpenSDS CSI plugin
+* CSI plugin refactoring and FC support
+* Southbound Fusion Storage and OceanStor V3/V5 volume drivers
+* Integrated profiles properties definition and selector filtering.
+* Support external volumes for VMs or baremetal.
+* Add API support for AvailabilityZone.
+* Installation with Helm (tested with LVM)
+
+The OpenSDS controller (Hotpot), the north bound plugins (Sushi), the multiple cloud(Gelato), 
+the opensds dashboard and the installer can be downloaded from here:
+
+`Hotpot <https://github.com/opensds/opensds/releases/tag/v0.4.0>`__
+`Sushi <https://github.com/opensds/nbp/releases/tag/v0.4.0>`__
+`Gelato <https://github.com/opensds/multi-cloud/releases/tag/v0.4.0>`__
+`Dashboard <https://github.com/opensds/opensds-dashboard/releases/tag/v0.4.0>`__
+`Installer <https://github.com/opensds/opensds-installer/releases/tag/v0.4.0>`__
+
+
 Aruba
 -----
 
 The OpenSDS Aruba release completed June 30, 2018.
 
 Features
---------
+>>>>>>>>
 
 The Aruba release adds the following functionality:
 
@@ -29,8 +66,6 @@ The Aruba release adds the following functionality:
 The OpenSDS controller (Hotpot), the north bound plugins (Sushi), and the
 installer can be downloaded from here:
 
-`Hotpot <https://github.com/opensds/opensds/releases/tag/v0.2.0>`_
-
-`Sushi <https://github.com/opensds/nbp/releases/tag/v0.2.0>`_
-
-`Installer <https://github.com/opensds/opensds-installer/releases/tag/v0.2.0>`_
+`Hotpot <https://github.com/opensds/opensds/releases/tag/v0.2.0>`__
+`Sushi <https://github.com/opensds/nbp/releases/tag/v0.2.0>`__
+`Installer <https://github.com/opensds/opensds-installer/releases/tag/v0.2.0>`__