tree dc95388ee139fbda7fa4207d235a87be459cdcd0
parent daedd6e6b7d3583868dba242677100958c364f70
parent 915b548d04094ce4d48a848e3837395d40f3de88
author Adrian Cole <adrian@jclouds.org> 1333946353 -0600
committer Adrian Cole <adrian@jclouds.org> 1333946353 -0600

Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x

* 'master' of github.com:jclouds/jclouds: (34 commits)
  Issue 899:NPE on cleanUpIncidentalResourcesOfDeadNodes
  openstack-nova-ec2 errors on authorizing security group to itself, and also needs to auto-allocate elastic ips
  updated error parser to work with Nova EC2 error message
  moved cacheloaders to the correct package
  default to allocate elastic ips on openstack-nova-ec
  more details when image doesn't match
  PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest
  fix Accept header in delete
  fix (unused) createImage http body in 404 test.
  add tests for createImage, switch argument order.
  remove unused import statements.
  create an image from a nova vm instance.
  Issue 891: update to support lucid
  added openstack-nova-ec2 to allcompute
  Updated PlatformServices attribute name for RUN@cloud's TweetStore version
  Updated PlatformServices attribute name for OpenShift's TweetStore version
  ensure tests are tidy, consistent, and clean up after themselves
  refactor out test session to exist on the suite scope
  make adminContext more robust
  refactor out admin tests
  ...