You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/07/08 11:18:11 UTC
[1/2] git commit: updated refs/heads/master-6-17-stable to 9a049ad
Updated Branches:
refs/heads/master-6-17-stable 30161f859 -> 9a049ad60
pod/host dedication failure cases
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c292272
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c292272
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c292272
Branch: refs/heads/master-6-17-stable
Commit: 9c292272addcbc7912be4a50cab1cc008d7b0cf4
Parents: 8b9c157
Author: Pranav Saxena <ps...@gmail.com>
Authored: Mon Jul 8 14:32:17 2013 +0530
Committer: Pranav Saxena <ps...@gmail.com>
Committed: Mon Jul 8 14:32:17 2013 +0530
----------------------------------------------------------------------
ui/scripts/system.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c292272/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 831d517..6844431 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8975,6 +8975,10 @@
}
}
+ else {
+ args.response.success({data: item});
+ }
+
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@@ -11027,6 +11031,10 @@
});
}
}
+ else {
+ args.response.success({data: item});
+ }
+
},
error: function(XMLHttpResponse) {
[2/2] git commit: updated refs/heads/master-6-17-stable to 9a049ad
Posted by pr...@apache.org.
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 <ps...@gmail.com>
Authored: Mon Jul 8 14:32:42 2013 +0530
Committer: Pranav Saxena <ps...@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(-)
----------------------------------------------------------------------