)]}'
{
  "commit": "29c287ffea52cb16872f8037348eda2fd008c9dd",
  "tree": "8f6ac5589f9319c9e2d80c557b4f459a45fae7cb",
  "parents": [
    "4bc09f221dd8e45c934623ee1d76fb5ffbf7580d"
  ],
  "author": {
    "name": "Tony Mack",
    "email": "tmack@paris.CS.Princeton.EDU",
    "time": "Thu Apr 11 21:07:16 2013 -0400"
  },
  "committer": {
    "name": "Tony Mack",
    "email": "tmack@paris.CS.Princeton.EDU",
    "time": "Thu Apr 11 21:07:16 2013 -0400"
  },
  "message": "merge latest code\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "812ca1593b1961d19f2b5298dd1b9864a384a963",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/deployment_networks.py",
      "new_id": "80b4ff3e33cd70c54456931aca7f693926152863",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/deployment_networks.py"
    },
    {
      "type": "modify",
      "old_id": "a2d0b23ec789d1d4a3adb421f3c9cc98297029ff",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/flavors.py",
      "new_id": "ee55f73c4f6d304d2d8de2d979688453cba4c2b6",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/flavors.py"
    },
    {
      "type": "modify",
      "old_id": "b773b0b358da2c1e336811449e9857a27ed5c128",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/images.py",
      "new_id": "0b140431e350bcb69a2b5aa8a38297075a19e1d7",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/images.py"
    },
    {
      "type": "modify",
      "old_id": "b255e981a97d74ba83e10af178ec1e4de5ce0a98",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/keys.py",
      "new_id": "2c90140afd8d1d94e843df84aba8400930b03b76",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/keys.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "47934baab4a09ed6c8f6ff26bcc9b3ffe2da9832",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/nodes.py"
    },
    {
      "type": "modify",
      "old_id": "844fb4fd8d15993a336d570607a03b9d88bf43a5",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/roles.py",
      "new_id": "6c61e250f1abb45d00a220542e17a1d085009886",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/roles.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "4c4158ed15e763e3b5670d6aa8be8454fd69143a",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/site_privileges.py"
    },
    {
      "type": "modify",
      "old_id": "0d07605fc15b2ffa51b860999bc509f01313d329",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/sites.py",
      "new_id": "540f815c2c316e10bb2be59f6caa2990607c4016",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/sites.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "91936320af7c6063833e29ed7653bf2aaa2d254f",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/slice_memberships.py"
    },
    {
      "type": "modify",
      "old_id": "3f5005085848b4990653968cf3636ccd4a493f56",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/slices.py",
      "new_id": "731fa7567d1dd525cf579623882439e5c525a2b5",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/slices.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "0bdaa5d82c03e2979c00d5763cdfe184d11c123a",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/slivers.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "ad53da03d951cc81ae43683b3c57bb1ed7badb60",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/subnets.py"
    },
    {
      "type": "modify",
      "old_id": "18a68c7184d05db6b006d303d19104d47f908f80",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api/users.py",
      "new_id": "d543782f219afc0094d39b766560a87224014dbd",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api/users.py"
    },
    {
      "type": "modify",
      "old_id": "3859188aacc57ba05ed9fd239ab5fc8e14089640",
      "old_mode": 33188,
      "old_path": "plstackapi/core/api_root.py",
      "new_id": "583e7c4f1b3811cf2ac37a33d5fdeccefda79959",
      "new_mode": 33188,
      "new_path": "plstackapi/core/api_root.py"
    },
    {
      "type": "modify",
      "old_id": "62d943b6d6a2b6e527f4942e0e84f7941afdc2f1",
      "old_mode": 33188,
      "old_path": "plstackapi/core/fixtures/initial_data.json",
      "new_id": "47f51756778c80b993411656ef894e3cfc876562",
      "new_mode": 33188,
      "new_path": "plstackapi/core/fixtures/initial_data.json"
    },
    {
      "type": "delete",
      "old_id": "d68d80184203c781196f621fa3e348ac1b43ffa8",
      "old_mode": 33188,
      "old_path": "plstackapi/core/models.py",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "7b3268c9984bcddbb19ea34a9e86fe81ec06b6a9",
      "old_mode": 33188,
      "old_path": "plstackapi/core/models/role.py",
      "new_id": "12743efa039309fe356b9a0e6226da28d634a19a",
      "new_mode": 33188,
      "new_path": "plstackapi/core/models/role.py"
    },
    {
      "type": "modify",
      "old_id": "5ec04c451e38c4defd17613fae09c58432b84ddb",
      "old_mode": 33188,
      "old_path": "plstackapi/core/models/site.py",
      "new_id": "a2903f95bb11c51002d1cdd861c9ce29e0f65f04",
      "new_mode": 33188,
      "new_path": "plstackapi/core/models/site.py"
    },
    {
      "type": "modify",
      "old_id": "24c44a6b9ad1120712fea4f24afdc9c84d03d4bb",
      "old_mode": 33188,
      "old_path": "plstackapi/core/models/slice.py",
      "new_id": "63941c7fea5b20e43f5a86dd14f0352b346e0c19",
      "new_mode": 33188,
      "new_path": "plstackapi/core/models/slice.py"
    },
    {
      "type": "modify",
      "old_id": "6f7aabe352afde8895df54d65ecda4070984cddc",
      "old_mode": 33188,
      "old_path": "plstackapi/core/models/sliver.py",
      "new_id": "9d5857e18086785ac550877fb1c3b327cd2013de",
      "new_mode": 33188,
      "new_path": "plstackapi/core/models/sliver.py"
    },
    {
      "type": "modify",
      "old_id": "291ffe8ee6a77c09b6d54675bce86edddbb1992e",
      "old_mode": 33188,
      "old_path": "plstackapi/core/models/subnet.py",
      "new_id": "70f8176b79c6ffd10bea47ec5f6bba05458e40af",
      "new_mode": 33188,
      "new_path": "plstackapi/core/models/subnet.py"
    },
    {
      "type": "modify",
      "old_id": "9a1d1189564d6ddfec5c3f92784da4284b55dcdd",
      "old_mode": 33188,
      "old_path": "plstackapi/core/serializers.py",
      "new_id": "f6fbe8c11fca39407b2e9de764be91ba4faed994",
      "new_mode": 33188,
      "new_path": "plstackapi/core/serializers.py"
    },
    {
      "type": "modify",
      "old_id": "e4bf5c381b45a576d1b830c3309dd307fe6134da",
      "old_mode": 33188,
      "old_path": "plstackapi/core/urls.py",
      "new_id": "9493a06daf2bc68eeadf62c90424ca7ef1265d94",
      "new_mode": 33188,
      "new_path": "plstackapi/core/urls.py"
    },
    {
      "type": "delete",
      "old_id": "c2730bb498f743333df2f66486812d988699488b",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views.py",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    },
    {
      "type": "modify",
      "old_id": "60e803035a2302e95dc8a15f51439499f139174a",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views/deployment_networks.py",
      "new_id": "60e8b14a7c01051bfb18b7068c61835fb78afdf6",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/deployment_networks.py"
    },
    {
      "type": "modify",
      "old_id": "ef4849966f19768ec1009ec85984e195506e2d22",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views/flavors.py",
      "new_id": "0e06c8efa1d3fca77efb236ddaf052e207a6e2a9",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/flavors.py"
    },
    {
      "type": "modify",
      "old_id": "f48cb713c8fd5387786331a4ce7ee3c855e64431",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views/images.py",
      "new_id": "4a548acdf571e52e9373418215b571b4a485678a",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/images.py"
    },
    {
      "type": "modify",
      "old_id": "6b52b8e390a8d9a77398e1ac9a8779a8257efe0d",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views/keys.py",
      "new_id": "80a378db264b046e2b6c90a66b2335e02284f5d7",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/keys.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "baa9f1789f13e7e8b05607ac6d4e65ef4a269eba",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/nodes.py"
    },
    {
      "type": "modify",
      "old_id": "05eb77e1937d47df15d5a5b196190e23a0bb6d7e",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views/roles.py",
      "new_id": "74fe789c829c1d70f2e2ecdc961912381f3d0dad",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/roles.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "b104fa76555b863410aa992b321b2e5c56a4cd57",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/site_privileges.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "a4f684865eb7bb5a83f11258b42e85cad97fba44",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/slice_memberships.py"
    },
    {
      "type": "modify",
      "old_id": "6015f4d0fad9880f0f8d49337203a31c4a61425a",
      "old_mode": 33188,
      "old_path": "plstackapi/core/views/slices.py",
      "new_id": "01415bb83be7ff6b3af2f076985d6620e870164d",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/slices.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "40634197d2b97ea170524c54757b020b8517766b",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/slivers.py"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "d96d0482d4c7e8fdad359401f2d5bcf3815b812d",
      "new_mode": 33188,
      "new_path": "plstackapi/core/views/subnets.py"
    },
    {
      "type": "modify",
      "old_id": "8b475deb6e6e642f69b9efe15be9903ce77087d9",
      "old_mode": 33188,
      "old_path": "plstackapi/openstack/driver.py",
      "new_id": "8817990872b3267aadcd62a75083bb733142ae1c",
      "new_mode": 33188,
      "new_path": "plstackapi/openstack/driver.py"
    }
  ]
}