{"ref":"refs/heads/snaiksat/l3apiframework","push_id":55764661,"commits":[{"sha":"05df0870191fac0353fe12a33efff68ef7ed0784","author":{"email":"f819565b0c6739b8857cf1cc50025895e9cbccb2@cisco.com","name":"Sumit Naiksatam"},"url":"https://api.github.com/repos/CiscoSystems/quantum/commits/05df0870191fac0353fe12a33efff68ef7ed0784","message":"Merge remote branch 'upstream/master'"},{"sha":"91f396382c4145cb5884f28346f9b8ec68d66a8a","author":{"email":"f819565b0c6739b8857cf1cc50025895e9cbccb2@cisco.com","name":"Sumit Naiksatam"},"url":"https://api.github.com/repos/CiscoSystems/quantum/commits/91f396382c4145cb5884f28346f9b8ec68d66a8a","message":"Merge remote branch 'origin' into snaiksat/l3apiframework\n\nConflicts:\n\tquantum/api/__init__.py\n\tquantum/api/faults.py\n\tquantum/common/exceptions.py\n\tquantum/common/test_lib.py\n\tquantum/db/api.py\n\tquantum/db/models.py"}],"head":"91f396382c4145cb5884f28346f9b8ec68d66a8a","size":2}