Fixed potential race condition where a worker thread would report that
no private key was available when spinning up the cluster.
Changed version number for custom build.
m1.mediums only have 1 ephemeral drive.
Merge pull request #1 from rescale/fix-ec2-instance-volumes

m1.mediums only have 1 ephemeral drive.
m1.small and c1.mediums now use /dev/sdb for the ephemeral drive.
Added cr1.8xlarge instance type.
Merge pull request #2 from rescale/add_cr1_instance_type

Added cr1.8xlarge instance type.
Removed abiquo from the pom file
Merge branch 'jclouds-1.5.1-rescale' into jclouds-1.5.10-rescale

Conflicts:
	all/pom.xml
	allblobstore/pom.xml
	allcompute/pom.xml
	allloadbalancer/pom.xml
	antcontrib/pom.xml
	apis/atmos/pom.xml
	apis/byon/pom.xml
	apis/cloudfiles/pom.xml
	apis/cloudservers/pom.xml
	apis/cloudsigma/pom.xml
	apis/cloudstack/pom.xml
	apis/cloudwatch/pom.xml
	apis/deltacloud/pom.xml
	apis/ec2/pom.xml
	apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/EC2HardwareBuilder.java
	apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java
	apis/elasticstack/pom.xml
	apis/eucalyptus/pom.xml
	apis/filesystem/pom.xml
	apis/nova/pom.xml
	apis/openstack-keystone/pom.xml
	apis/openstack-nova-ec2/pom.xml
	apis/openstack-nova/pom.xml
	apis/pom.xml
	apis/rackspace-cloudidentity/pom.xml
	apis/s3/pom.xml
	apis/sqs/pom.xml
	apis/sts/pom.xml
	apis/swift/pom.xml
	apis/vcloud/pom.xml
	apis/walrus/pom.xml
	archetypes/compute-service-archetype/pom.xml
	archetypes/pom.xml
	archetypes/rest-client-archetype/pom.xml
	assemblies/pom.xml
	blobstore/pom.xml
	common/aws/pom.xml
	common/azure/pom.xml
	common/openstack/pom.xml
	common/pom.xml
	common/trmk/pom.xml
	compute/pom.xml
	core/pom.xml
	drivers/apachehc/pom.xml
	drivers/bouncycastle/pom.xml
	drivers/enterprise/pom.xml
	drivers/gae/pom.xml
	drivers/joda/pom.xml
	drivers/jsch/pom.xml
	drivers/log4j/pom.xml
	drivers/netty/pom.xml
	drivers/pom.xml
	drivers/slf4j/pom.xml
	drivers/sshj/pom.xml
	labs/abiquo/pom.xml
	labs/aws-elb/pom.xml
	labs/aws-iam/pom.xml
	labs/aws-rds/pom.xml
	labs/azure-management/pom.xml
	labs/carrenza-vcloud-director/pom.xml
	labs/cdmi/pom.xml
	labs/cloudstack-ec2/pom.xml
	labs/dmtf/pom.xml
	labs/elb/pom.xml
	labs/fgcp-au/pom.xml
	labs/fgcp-de/pom.xml
	labs/fgcp/pom.xml
	labs/greenqloud-compute/pom.xml
	labs/greenqloud-storage/pom.xml
	labs/iam/pom.xml
	labs/jenkins/pom.xml
	labs/joyent-cloudapi/pom.xml
	labs/joyentcloud/pom.xml
	labs/nodepool/pom.xml
	labs/openstack-glance/pom.xml
	labs/openstack-quantum/pom.xml
	labs/openstack-swift/pom.xml
	labs/opsource-servers/pom.xml
	labs/pom.xml
	labs/rds/pom.xml
	labs/savvis-symphonyvpdc/pom.xml
	labs/smartos-ssh/pom.xml
	labs/vcloud-director/pom.xml
	labs/virtualbox/pom.xml
	loadbalancer/pom.xml
	pom.xml
	project/pom.xml
	providers/aws-cloudwatch/pom.xml
	providers/aws-ec2/pom.xml
	providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java
	providers/aws-s3/pom.xml
	providers/aws-sqs/pom.xml
	providers/azureblob/pom.xml
	providers/bluelock-vcloud-zone01/pom.xml
	providers/cloudfiles-uk/pom.xml
	providers/cloudfiles-us/pom.xml
	providers/cloudonestorage/pom.xml
	providers/cloudservers-uk/pom.xml
	providers/cloudservers-us/pom.xml
	providers/cloudsigma-lvs/pom.xml
	providers/cloudsigma-zrh/pom.xml
	providers/elastichosts-lax-p/pom.xml
	providers/elastichosts-lon-b/pom.xml
	providers/elastichosts-lon-p/pom.xml
	providers/elastichosts-sat-p/pom.xml
	providers/elastichosts-tor-p/pom.xml
	providers/eucalyptus-partnercloud-ec2/pom.xml
	providers/eucalyptus-partnercloud-s3/pom.xml
	providers/glesys/pom.xml
	providers/go2cloud-jhb1/pom.xml
	providers/gogrid/pom.xml
	providers/greenhousedata-element-vcloud/pom.xml
	providers/hpcloud-compute/pom.xml
	providers/hpcloud-objectstorage/pom.xml
	providers/ninefold-compute/pom.xml
	providers/ninefold-storage/pom.xml
	providers/openhosting-east1/pom.xml
	providers/pom.xml
	providers/rackspace-cloudloadbalancers-uk/pom.xml
	providers/rackspace-cloudloadbalancers-us/pom.xml
	providers/rackspace-cloudservers-uk/pom.xml
	providers/rackspace-cloudservers-us/pom.xml
	providers/rimuhosting/pom.xml
	providers/serverlove-z1-man/pom.xml
	providers/skalicloud-sdg-my/pom.xml
	providers/slicehost/pom.xml
	providers/softlayer/pom.xml
	providers/stratogen-vcloud-mycloud/pom.xml
	providers/synaptic-storage/pom.xml
	providers/trmk-ecloud/pom.xml
	providers/trmk-vcloudexpress/pom.xml
	providers/trystack-nova/pom.xml
	resources/pom.xml
	scriptbuilder/pom.xml
	skeletons/pom.xml
	skeletons/standalone-compute/pom.xml