merge from head
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/049dd724 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/049dd724 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/049dd724 Branch: refs/heads/vmsync Commit: 049dd7242e7778eaa4a5ac9b68dc3d2f7a3fb1e6 Parents: 7b7db05 e7c3479 Author: Alex Huang <alex.hu...@gmail.com> Authored: Mon Jun 24 16:51:59 2013 -0700 Committer: Alex Huang <alex.hu...@gmail.com> Committed: Mon Jun 24 16:51:59 2013 -0700 ---------------------------------------------------------------------- client/pom.xml | 2 ++ .../com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/049dd724/client/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/049dd724/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java ----------------------------------------------------------------------
