1.1.0

CHANGELOG.md

@@ -2,65 +2,47 @@
 
 ### Features
 
-<<<<<<< CHANGELOG.md
 #### CloudAPI
-=======
-## CloudAPI
->>>>>>> CHANGELOG.md
 
 - Account
-	- Delete "ResTypes" field in Create/Update request structs
-	- Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
+  - Delete "ResTypes" field in Create/Update request structs
+  - Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
 - BService
-	- Add fields "SEPID", "SEPPool" in GroupAdd request structs
-	- Add field "PoolName" in List/ListDeleted response structs
+  - Add fields "SEPID", "SEPPool" in GroupAdd request structs
+  - Add field "PoolName" in List/ListDeleted response structs
 - Compute
-	- Add fields "PresentTo", "Shareable" in Get/List/ListDeleted response structs
+  - Add fields "PresentTo", "Shareable" in Get/List/ListDeleted response structs
 - Disks
-	- Add fields "PresentTo", "Shareable", "Computes" in Get/List/ListDeleted/ListUnattached/Search response structs
-	- Delete fields "ComputeID", "ComputeName" in List/ListDeleted/ListUnattached/Search response structs
-<<<<<<< CHANGELOG.md
-	- Add Share/Unshare methods
-=======
->>>>>>> CHANGELOG.md
+  - Add fields "PresentTo", "Shareable", "Computes" in Get/List/ListDeleted/ListUnattached/Search response structs
+  - Delete fields "ComputeID", "ComputeName" in List/ListDeleted/ListUnattached/Search response structs
+  - Add Share/Unshare methods
 - FLIPgroup
-	- Add field "ClientNames" in Get response struct
+  - Add field "ClientNames" in Get response struct
 - Image
-	- Add field "PresentTo" in Get response struct
+  - Add field "PresentTo" in Get response struct
 - RG
-	- Delete "ResTypes" field in Create/Update request structs
-	- Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
+  - Delete "ResTypes" field in Create/Update request structs
+  - Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
 
-<<<<<<< CHANGELOG.md
 #### Cloudbroker
-=======
-## Cloudbroker
->>>>>>> CHANGELOG.md
 
 - Account
-	- Add fields "SEPs", "ResourceTypes", "PresentTo", "DiskSizeMax", "UniqPools", "Shareable" in Get/List/ListDeleted/ListDisks/ListRG response structs 
+  - Add fields "SEPs", "ResourceTypes", "PresentTo", "DiskSizeMax", "UniqPools", "Shareable" in Get/List/ListDeleted/ListDisks/ListRG response structs
 - Compute
-	- Add fields "VINSConnected", "TotalDiskSize", "Shareable", "PresentTo" in Get/List/ListDeleted response structs
+  - Add fields "VINSConnected", "TotalDiskSize", "Shareable", "PresentTo" in Get/List/ListDeleted response structs
 - Disks
-	- Add fields "ReferenceID", "Shareable", "PresentTo", "Computes" in List/ListDeleted/ListUnattached/Search response structs
-	- Delete fields "ComputeID", "ComputeName" in List/ListDeleted/ListUnattached/Search response structs
-<<<<<<< CHANGELOG.md
-	- Add Share/Unshare methods
-=======
->>>>>>> CHANGELOG.md
+  - Add fields "ReferenceID", "Shareable", "PresentTo", "Computes" in List/ListDeleted/ListUnattached/Search response structs
+  - Delete fields "ComputeID", "ComputeName" in List/ListDeleted/ListUnattached/Search response structs
+  - Add Share/Unshare methods
 - Grid
-	- Add fields "SEPs", "DiskSizeMax" in Get/List response structs
+  - Add fields "SEPs", "DiskSizeMax" in Get/List response structs
 - Image
-	- Add field "PresentTo" in Get response struct
+  - Add field "PresentTo" in Get response struct
 - KVMX86
-	- Add field "Userdata" in MassCreate request struct
-	- Delete field "IPAddr" in MassCreate request struct
+  - Add field "Userdata" in MassCreate request struct
+  - Delete field "IPAddr" in MassCreate request struct
 - KVMPPC
-	- Add field "Userdata" in MassCreate request struct
-	- Delete field "IPAddr" in MassCreate request struct
+  - Add field "Userdata" in MassCreate request struct
+  - Delete field "IPAddr" in MassCreate request struct
 - RG
-	- Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
-<<<<<<< CHANGELOG.md
-
-=======
->>>>>>> CHANGELOG.md
+  - Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs