tree 3bafa7b81c16355e27fb6b4a4086556ba4982f4b
parent c800b354d571b29f8d453833021fcf198d371a39
parent 8311d0a4e49f5e7be41d48b511ff705b8d18a432
author Adrian Cole <adrian@jclouds.org> 1340152610 -0600
committer Adrian Cole <adrian@jclouds.org> 1340152610 -0600

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

* 'master' of github.com:jclouds/jclouds:
  Issue 988:Extra port added to swift url
  consistent ordering of hardware
  fixed missing provider name on ninefold test
  Eliminate unlikely transient blobstore TOCTOU bug