Jeremy Daggett d57fb93211 Merge remote-tracking branch 'keg/master' ... Conflicts: common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestClientExpectTest.java		2012-02-02 15:06:39 -08:00
..
aws	updated current version to 1.4.0-SNAPSHOT	2012-01-16 13:08:32 -08:00
azure	Issue 820:Move off PropertiesBuilder for rocoto	2012-01-29 23:11:37 +08:00
openstack	Merge remote-tracking branch 'keg/master'	2012-02-02 15:06:39 -08:00
trmk	Issue 824:add field for hypervisor	2012-01-30 22:52:35 -08:00
pom.xml	updated current version to 1.4.0-SNAPSHOT	2012-01-16 13:08:32 -08:00