)]}'
{
  "commit": "a718d353f7acf0328d928673df6f22de1abc0acb",
  "tree": "df87e9aa65decaa4d0d4313fb0a83d301a0c9013",
  "parents": [
    "ecca117e345224059297f5c1ffa0f442209b3160",
    "c2118180d5e2e4442f6744e83089295060eba73e"
  ],
  "author": {
    "name": "Murali Reddy",
    "email": "muralimmreddy@gmail.com",
    "time": "Mon May 13 21:22:19 2013 +0530"
  },
  "committer": {
    "name": "Murali Reddy",
    "email": "muralimmreddy@gmail.com",
    "time": "Mon May 13 21:22:19 2013 +0530"
  },
  "message": "Merge branch \u0027master\u0027 into portablepublicip\n\nConflicts:\n\tapi/src/org/apache/cloudstack/api/ResponseGenerator.java\n\tserver/src/com/cloud/api/ApiResponseHelper.java\n\tserver/src/com/cloud/network/NetworkServiceImpl.java\n\tserver/src/com/cloud/network/addr/PublicIp.java\n\tserver/src/com/cloud/server/ManagementServerImpl.java\n\tserver/test/com/cloud/network/MockNetworkManagerImpl.java\n\tserver/test/com/cloud/vpc/MockConfigurationManagerImpl.java\n\tserver/test/com/cloud/vpc/MockNetworkManagerImpl.java\n\tsetup/db/db/schema-410to420.sql\n",
  "tree_diff": []
}
