Merge branch 'master' into bvt
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b705c2ae Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b705c2ae Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b705c2ae Branch: refs/heads/bvt Commit: b705c2ae787ffc68c118c1556a894d2a934b9833 Parents: 6f2d092 23d301f Author: Prasanna Santhanam <[email protected]> Authored: Sat Mar 23 20:28:08 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sat Mar 23 20:28:08 2013 +0530 ---------------------------------------------------------------------- awsapi-setup/setup/cloud-setup-bridge | 2 +- packaging/centos63/cloud.spec | 39 +++++++++++--- .../kvm/resource/LibvirtComputingResource.java | 2 +- .../hypervisor/kvm/storage/KVMStoragePool.java | 2 + .../kvm/storage/LibvirtStorageAdaptor.java | 2 + .../hypervisor/kvm/storage/LibvirtStoragePool.java | 10 ++++ pom.xml | 39 ++++++++------- python/lib/cloudutils/serviceConfigServer.py | 4 +- ui/scripts/cloudStack.js | 5 ++ ui/scripts/regions.js | 6 ++- ui/scripts/ui-custom/regions.js | 5 ++- ui/scripts/ui/widgets/listView.js | 32 +++++++++++- 12 files changed, 112 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b705c2ae/pom.xml ----------------------------------------------------------------------
