)]}'
{
  "commit": "6a8c2bd4ec997f149cd340887a56da3b87b593c1",
  "tree": "52a29913209ded6f5c9f61599dce7dfbd72acef0",
  "parents": [
    "820c6b3ca4db727e123e39dc56ddc418540844d2",
    "f1a5d70542db8f9ac14e46412836db18f7758589"
  ],
  "author": {
    "name": "Sateesh Chodapuneedi",
    "email": "sateesh@apache.org",
    "time": "Fri May 31 13:16:26 2013 +0530"
  },
  "committer": {
    "name": "Sateesh Chodapuneedi",
    "email": "sateesh@apache.org",
    "time": "Fri May 31 13:16:26 2013 +0530"
  },
  "message": "Merge branch \u0027vmware-datamodel\u0027 of https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-datamodel\n\nConflicts:\n\tclient/tomcatconf/nonossComponentContext.xml.in\n\tplugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java\n\tplugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java\n\tplugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java\n\nSigned-off-by: Sateesh Chodapuneedi \u003csateesh@apache.org\u003e\n",
  "tree_diff": []
}