* '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
...
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.
The CloudStack Template status field is generally presented as human
readable text. This commit extends the enum fromValue() to understand
the known status strings in CloudStack 3.0.4.
* '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
...
This commit improves filesystem blobstore compatibility on Windows.
This partially reverts cfe3169. Tested on Ubuntu 12.04 and Windows 7.
References #737. Closes#912.
Group by container, blob, and miscellaneous methods. Within these
groups, sort by by exists, getter, setter, and remove. Code movement
only; no functional changes.
DescribeSnapshotsResponseHandler behaved incorrectly when a snapshot had
metadata tags added - it would stop parsing and start the next Snapshot
object every time it saw an </item> tag. Since metadata tags contain
</item>, each tag would cause a new Snapshot object in the response
containing all nulls. Fixed by counting the tag nesting depth and only
responding to </item> at the correct nesting level.
* 'master' of github.com:jclouds/jclouds: (33 commits)
optimize imports
reset loginpassword/privatekey when explicitly set
revised tests that AdminAccess change recently broke
Issue 1028:vCloud Director 1.5: require x-vcloud-authorization header on vcloud api
Add SYSTEM scope from DMTF CIMI. FGCP provider needs it.
Issue-1020 Add full name option for AdminUser and UserAdd
Add missing @Override in TransientStorageStrategy
format and imports
Ensure that EventBus is a singleton
Introduce LocalAsyncBlobStore
Miscellaneous local blobstore cleanups
Prefer valueOf over explicit object creation
Move helper method to TransientStorageStrategy
Move copy(MutableBlobMetadata) to BlobStoreUtils
Cloudstack VirtualMachines can have negative cpuUsed values for some reason
removed dead code
corrected destroyNodes bug
Fixed compilation failures caused by 70fa74df1a
Remove encodeString() and encodeString(String)
Shuffle blobstore parameters to match superclass
...
Adrian Cole
Jeremy Daggett
Andrei Savu
Andrew Phillips
Adrian Cole
Everett Toews
Richard Downer
Andrew Donald Kennedy
Andrew Gaul
Adam Lowe
vijaykiran