)]}'
{
  "commit": "e59193958f37426d6c9b64fedef4e4de0fbdcd4c",
  "tree": "fc0bd76795d3079e0285a4b62d89ade8e7d74d74",
  "parents": [
    "c4595ebbad5596bca72c9371f8c2c52dd2eae6dc"
  ],
  "author": {
    "name": "Philip Joseph",
    "email": "philip.joseph@riftio.com",
    "time": "Thu Feb 23 20:18:12 2017 +0530"
  },
  "committer": {
    "name": "Philip Joseph",
    "email": "philip.joseph@riftio.com",
    "time": "Thu Feb 23 20:38:20 2017 +0530"
  },
  "message": "Fix more merge conflicts\n\nSigned-off-by: Philip Joseph \u003cphilip.joseph@riftio.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "cce685cad59af4136ab38408434c00e9dc4a7310",
      "old_mode": 33261,
      "old_path": "examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py",
      "new_id": "ff706c88cf3b1590b229333a43c3edaa06d38a8f",
      "new_mode": 33261,
      "new_path": "examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py"
    },
    {
      "type": "modify",
      "old_id": "c0d0589473da06a79df039dd0f64d495c06ab6d0",
      "old_mode": 33261,
      "old_path": "examples/ping_pong_ns/rift/mano/examples/ping_setup.py",
      "new_id": "016920629d05bab8e595e5f83a1f554237852620",
      "new_mode": 33261,
      "new_path": "examples/ping_pong_ns/rift/mano/examples/ping_setup.py"
    },
    {
      "type": "modify",
      "old_id": "fdd62ed8359755993cf3a06bb610b476ee14b80c",
      "old_mode": 33261,
      "old_path": "examples/ping_pong_ns/rift/mano/examples/ping_start_stop.py",
      "new_id": "2608620c47c495dcf888807bc4867fffe4d57969",
      "new_mode": 33261,
      "new_path": "examples/ping_pong_ns/rift/mano/examples/ping_start_stop.py"
    },
    {
      "type": "modify",
      "old_id": "7bd247988d800ca311dbe09bf7191f3278d2a9d6",
      "old_mode": 33261,
      "old_path": "examples/ping_pong_ns/rift/mano/examples/pong_setup.py",
      "new_id": "f2e46bf78325c13bcd6a46211530f7b71ccf00cb",
      "new_mode": 33261,
      "new_path": "examples/ping_pong_ns/rift/mano/examples/pong_setup.py"
    },
    {
      "type": "modify",
      "old_id": "30e7fa6836db9b0e74073025b00df60f03decf28",
      "old_mode": 33261,
      "old_path": "examples/ping_pong_ns/rift/mano/examples/pong_start_stop.py",
      "new_id": "a8d6867e1575ab7b44251a050b822d8373c9ee87",
      "new_mode": 33261,
      "new_path": "examples/ping_pong_ns/rift/mano/examples/pong_start_stop.py"
    },
    {
      "type": "modify",
      "old_id": "8808dafcc84436afbfbd7b231939ce793554c0e0",
      "old_mode": 33188,
      "old_path": "models/plugins/yang/nsd.yang",
      "new_id": "494acf4b0ea805e7296cd9eb4da79061811c2eb2",
      "new_mode": 33188,
      "new_path": "models/plugins/yang/nsd.yang"
    },
    {
      "type": "modify",
      "old_id": "fb1bd03ec6c55b7c7d3320d9513c47b0ba88f34e",
      "old_mode": 33188,
      "old_path": "models/plugins/yang/vnfd.yang",
      "new_id": "75de5e331af57e4f73a3cd057c3a18f30ef40348",
      "new_mode": 33188,
      "new_path": "models/plugins/yang/vnfd.yang"
    }
  ]
}