Updated ec2 api model.

aws · Sep 15, 2015 · 6b534e3 · 6b534e3
1 parent 025f100
commit 6b534e3
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Unreleased Changes
 ------------------
 
+* Feature - Aws::EC2 - Added two new fields to expose data encryption key id,
+  and state message.
+
+* Feature - Aws::EC2 - Added support for the new "Diversified" allocation
+  strategy.
+
 * Feature - Aws::ElasticFileSystem - Added support for optional mount
   target ID to the DescribeMountTargets operation.
 

diff --git a/aws-sdk-core/apis/ec2/2015-04-15/api-2.json b/aws-sdk-core/apis/ec2/2015-04-15/api-2.json
@@ -1786,6 +1786,13 @@
         "locationName":"AllocationId"
       }
     },
+    "AllocationStrategy":{
+      "type":"string",
+      "enum":[
+        "lowestPrice",
+        "diversified"
+      ]
+    },
     "ArchitectureValues":{
       "type":"string",
       "enum":[
@@ -10253,6 +10260,10 @@
           "shape":"SnapshotState",
           "locationName":"status"
         },
+        "StateMessage":{
+          "shape":"String",
+          "locationName":"statusMessage"
+        },
         "StartTime":{
           "shape":"DateTime",
           "locationName":"startTime"
@@ -10288,6 +10299,10 @@
         "KmsKeyId":{
           "shape":"String",
           "locationName":"kmsKeyId"
+        },
+        "DataEncryptionKeyId":{
+          "shape":"String",
+          "locationName":"dataEncryptionKeyId"
         }
       }
     },
@@ -10591,6 +10606,10 @@
         "LaunchSpecifications":{
           "shape":"LaunchSpecsList",
           "locationName":"launchSpecifications"
+        },
+        "AllocationStrategy":{
+          "shape":"AllocationStrategy",
+          "locationName":"allocationStrategy"
         }
       }
     },