You can merge this Pull Request by running:

  git pull https://github.com/abayer/jclouds-1 jclouds-602-for-1.7.x

Or you can view, comment on it, or merge it online at:

  https://github.com/jclouds/jclouds/pull/416

-- Commit Summary --

  * JCLOUDS-602 - Add support for volumeType, iops and encrypted to EBS.
  * JCLOUDS-602. Added live tests for new EBS volume fields.

-- File Changes --

    M 
apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java 
(19)
    M apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java (82)
    M apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java (39)
    M apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java (72)
    M apis/ec2/src/main/java/org/jclouds/ec2/features/ElasticBlockStoreApi.java 
(31)
    A apis/ec2/src/main/java/org/jclouds/ec2/options/CreateVolumeOptions.java 
(146)
    M 
apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java
 (115)
    M apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java 
(9)
    M 
apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java (28)
    M 
apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java 
(32)
    M apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java (2)
    M apis/ec2/src/test/java/org/jclouds/ec2/features/AMIApiLiveTest.java (36)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/features/EC2ElasticBlockStoreApiExpectTest.java
 (73)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/features/ElasticBlockStoreApiLiveTest.java
 (72)
    A 
apis/ec2/src/test/java/org/jclouds/ec2/options/CreateVolumeOptionsTest.java 
(156)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptionsTest.java
 (75)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/options/RunInstancesOptionsTest.java (12)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/xml/CreateVolumeResponseHandlerTest.java 
(6)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java
 (16)
    M 
apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandlerTest.java
 (13)
    M apis/ec2/src/test/resources/created_volume.xml (3)
    M apis/ec2/src/test/resources/describe_images_ebs.xml (4)
    M apis/ec2/src/test/resources/describe_volumes.xml (6)
    M apis/ec2/src/test/resources/describe_volumes_single.xml (3)
    M 
providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
 (18)
    M 
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSAMIApiLiveTest.java
 (79)
    M 
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSAMIApiTest.java 
(33)
    A 
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/AWSElasticBlockStoreApiLiveTest.java
 (68)
    M 
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/AWSRunInstancesOptionsTest.java
 (10)

-- Patch Links --

https://github.com/jclouds/jclouds/pull/416.patch
https://github.com/jclouds/jclouds/pull/416.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/416

Reply via email to