Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
kvm	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
ovm	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
simulator	Consolidate RuntimeCloudException and CloudRuntimeException into one	2013-01-15 18:07:08 -08:00
vmware	PluggableService: Fix interface definition	2013-01-14 19:01:26 -08:00
xen	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00