Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d8dd1c9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d8dd1c9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d8dd1c9 Branch: refs/heads/master Commit: 3d8dd1c921dd16699824874a0c3fe147ac9642b0 Parents: c30821f 36e5cc2 Author: amoghvk <amogh.vase...@citrix.com> Authored: Mon Jul 14 17:30:12 2014 -0700 Committer: amoghvk <amogh.vase...@citrix.com> Committed: Mon Jul 14 17:30:12 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 4 ---- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 6 ++++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- ui/scripts/ui/widgets/detailView.js | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d8dd1c9/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ----------------------------------------------------------------------
