)]}'
{
  "commit": "21fa51b4ea610c501189add5e2be5693246aacfc",
  "tree": "6b3d10445e2916edef4e2b55f38809db15bbc780",
  "parents": [
    "12021c59a748f44dc4bd01b2b5edf5dc6047357b"
  ],
  "author": {
    "name": "Philip Joseph",
    "email": "philip.joseph@riftio.com",
    "time": "Thu Jan 12 09:16:22 2017 +0000"
  },
  "committer": {
    "name": "Philip Joseph",
    "email": "philip.joseph@riftio.com",
    "time": "Thu Jan 12 09:16:22 2017 +0000"
  },
  "message": "Fix merge conflicts\n\nSigned-off-by: Philip Joseph \u003cphilip.joseph@riftio.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "788f9d140323c227344b41feb4fbf23c721aa894",
      "old_mode": 33261,
      "old_path": "BUILD.sh",
      "new_id": "2e3ba89e1bd51b39f6b432afa02ee02a9ef2e358",
      "new_mode": 33261,
      "new_path": "BUILD.sh"
    },
    {
      "type": "modify",
      "old_id": "4a16c7a820344386b57f2e44b5b808420f22688a",
      "old_mode": 33261,
      "old_path": "examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py",
      "new_id": "3953787027707650f735b79429a42a7ebafa5d92",
      "new_mode": 33261,
      "new_path": "examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py"
    },
    {
      "type": "modify",
      "old_id": "29eb852f9bfd1941219deb235b65ab1108b563b4",
      "old_mode": 33188,
      "old_path": "models/plugins/yang/rw-vnfd.yang",
      "new_id": "456a667cc11239f3045951e7c209ac1ff25453cd",
      "new_mode": 33188,
      "new_path": "models/plugins/yang/rw-vnfd.yang"
    },
    {
      "type": "modify",
      "old_id": "be8acb4ba2ad125692765a319faf4b8ab577e701",
      "old_mode": 33188,
      "old_path": "models/plugins/yang/rw-vnfr.yang",
      "new_id": "7394706e273fc2d7d380568f280ca63b5b4fa99d",
      "new_mode": 33188,
      "new_path": "models/plugins/yang/rw-vnfr.yang"
    },
    {
      "type": "modify",
      "old_id": "d47472dd8f3fcd632eeb4e3074a749e65df81d54",
      "old_mode": 33188,
      "old_path": "models/plugins/yang/vnfd.yang",
      "new_id": "75de5e331af57e4f73a3cd057c3a18f30ef40348",
      "new_mode": 33188,
      "new_path": "models/plugins/yang/vnfd.yang"
    },
    {
      "type": "modify",
      "old_id": "cda6e90bed00dc931856d6f4e40d01b32425229b",
      "old_mode": 33188,
      "old_path": "rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py",
      "new_id": "6987128310c838df12b6961a2f5358e14a2c778f",
      "new_mode": 33188,
      "new_path": "rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py"
    },
    {
      "type": "modify",
      "old_id": "31b054488ecabab0ca78d2da9b8605cde2eea979",
      "old_mode": 33188,
      "old_path": "rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py",
      "new_id": "431be98b0809c662a18313c0abab7e36b196c678",
      "new_mode": 33188,
      "new_path": "rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py"
    },
    {
      "type": "modify",
      "old_id": "c9f7bb9e1238ee1834f67e50381614176770fa8b",
      "old_mode": 33261,
      "old_path": "rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py",
      "new_id": "84fd3d3339946d5f4349fa7fd987bdbd98b71936",
      "new_mode": 33261,
      "new_path": "rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py"
    },
    {
      "type": "modify",
      "old_id": "d3cef3e59acc948bba93287232ebd513fd52175c",
      "old_mode": 33261,
      "old_path": "rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py",
      "new_id": "65f557528b3273ddaf521825fbdfd082ab42d929",
      "new_mode": 33261,
      "new_path": "rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py"
    }
  ]
}