Merge branch 'vmware-datamodel' of
https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-datamodel
Conflicts:
client/tomcatconf/nonossComponentContext.xml.in
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
Signed-off-by: Sateesh Chodapuneedi <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a8c2bd4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a8c2bd4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a8c2bd4
Branch: refs/heads/vmware-datamodel
Commit: 6a8c2bd4ec997f149cd340887a56da3b87b593c1
Parents: 820c6b3 f1a5d70
Author: Sateesh Chodapuneedi <[email protected]>
Authored: Fri May 31 13:16:26 2013 +0530
Committer: Sateesh Chodapuneedi <[email protected]>
Committed: Fri May 31 13:16:26 2013 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
