Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35803805 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35803805 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35803805 Branch: refs/heads/master Commit: 35803805c78ddda76af1387f4004f9724ad7ac0c Parents: 0642a69 1f21848 Author: Rohit Yadav <[email protected]> Authored: Wed Nov 23 14:28:31 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Nov 23 14:28:31 2016 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35803805/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ----------------------------------------------------------------------
