Merge branch 'master-6-17-stable' of https://git-wip-us.apache.org/repos/asf/cloudstack into master-6-17-stable
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a049ad6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a049ad6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a049ad6 Branch: refs/heads/master-6-17-stable Commit: 9a049ad60ff3e1d2a5c5ad1a83961f5a9e81c6c6 Parents: 9c29227 30161f8 Author: Pranav Saxena <psb...@gmail.com> Authored: Mon Jul 8 14:32:42 2013 +0530 Committer: Pranav Saxena <psb...@gmail.com> Committed: Mon Jul 8 14:32:42 2013 +0530 ---------------------------------------------------------------------- .../vmware/resource/VmwareResource.java | 4 +- .../maint/test_vpc_host_maintenance.py | 4 - .../component/test_vpc_network_lbrules.py | 5 -- .../component/test_vpc_network_pfrules.py | 1 - .../component/test_vpc_network_staticnatrule.py | 8 +- test/integration/component/test_vpc_routers.py | 14 ---- tools/marvin/marvin/integration/lib/base.py | 8 +- .../cloud/hypervisor/vmware/mo/ClusterMO.java | 12 ++- .../vmware/mo/FeatureKeyConstants.java | 26 ++++++ .../com/cloud/hypervisor/vmware/mo/HostMO.java | 13 +++ .../vmware/mo/LicenseAssignmentManagerMO.java | 87 ++++++++++++++++++++ .../hypervisor/vmware/mo/LicenseManagerMO.java | 45 ++++++++++ .../vmware/mo/VmwareHypervisorHost.java | 9 +- .../hypervisor/vmware/util/VmwareHelper.java | 37 +++++++-- 14 files changed, 225 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
