* 'master' of https://github.com/jclouds/jclouds: (25 commits)
Moved HP Storage Container Metadata parsing to Swift since it's a standard Swift feature. Moved HP Storage createContainer(String, CreateContainerOptions) to CommonSwiftClient since it's a standard Swift feature. Added support for setting Swift Container Metadata. Added support for deleting Swift Container Metadata. Added copy object feature to Swift. Removed unnecessary TODO comment. Changed DeleteContainerMetadataOptions to just be a List. Changed CopyObjectOptions to be just be a String. Changed CommonSwiftClient.setContainerMetadata() to use just a Map for metadata. Added ExpectTests. Changed setContainerMetadata() to use Iterable instead of List for more generic type goodness. Changed copyObject() to use 4 String params instead of 2 String params to be similar to other such methods in jclouds.
issue 830: added systemadmin package; more tests fixed
CDMI: adding support for 1) query parameters 2) non-cdmi content data object operations
Javadoc update for CloudStack Template.getStatus()
CloudStack template status parsing update
merge
azure management base implementation
Update parsing of Status in CloudStack Template
default region endpoint for rackspace legacy apis
issue 830: fixed VAppTemplateApiLiveTest.deleteVAppTemplate
Issue 1075:switch to use jetty for java install/web service tests
nslookup on CentOS 6.2 doesn't set error code when failing, so grep expected output instead
review addressed
issue 830: keypair
Added test descriptions and dependencies to basic Nova live tests
Configure duplicates plugin to ignore .gitattributes
decrufted metadataapi
configure .gitattributes to not convert shell scripts to CRLF on Windows
Correct typo
issue 830: more LiveTests fixed on query, vapp, vapptemplate and vdc features
...
* 'master' of github.com:jclouds/jclouds: (30 commits)
Merge Keystone optional admin API provider with optional extension provider
Added binding for optional extensions
Make the OpenStack extension lists accessible for all APIs. Copied the Nova extension related code to the shared keystone package and added providers for extensions and aliases to all modules
added statement to rebase dist packages
added VAppNetworksLiveTest
Further OpenStack extensibility changes. Fixing constructors in RestContext classes
Fixed a possible NPE when ServiceFunctionLoader finds no OSGi service for a function.
fixed broken test
threading issue in test
openstack-quantum extensibility
openstack-swift extensibility
openstack-glance extensibility
openstack-nova extensibility
openstack-keystone extensibility
add FirstNetwork, in line with FirstRegion, etc., for use in FGCP provider
missing class
refactoring of smartos-ssh
Extend the VmSpecification to allow for all the extra memory settings.
Issue 1067:update to guava 13
removed invalid @Nullable usage and also usage of javax package usage
...
Adrian Cole
Everett Toews
Adrian Cole
Jeremy Daggett
Andrew Donald Kennedy
Adam Lowe
Andrew Gaul