{"push_id":1461628521,"size":5,"distinct_size":1,"ref":"refs/heads/master","head":"7c4e28962dbd7758bf70b4f33a49dfb9764a403b","before":"cd209eae3f79f09a8bb2dc3ebf0e7210dcc8df8c","commits":[{"sha":"6e8cf2a05339bad6540a0b4f3b951a665d558101","author":{"name":"Michael Wei","email":"1deffa2866d3eabac1401fda53395c114d2f9f61@cs.ucsd.edu"},"message":"add conflict parameter annotation and a map for accessing the conflict objects","distinct":false,"url":"https://api.github.com/repos/CorfuDB/CorfuDB/commits/6e8cf2a05339bad6540a0b4f3b951a665d558101"},{"sha":"1ca77b5039adf8c1915db60bf169f3e5b95a8189","author":{"name":"Michael Wei","email":"1deffa2866d3eabac1401fda53395c114d2f9f61@cs.ucsd.edu"},"message":"fix double conflict param","distinct":false,"url":"https://api.github.com/repos/CorfuDB/CorfuDB/commits/1ca77b5039adf8c1915db60bf169f3e5b95a8189"},{"sha":"e10c1bfb065ad9f576653a7ccb78ebf6740dfa90","author":{"name":"Michael Wei","email":"1deffa2866d3eabac1401fda53395c114d2f9f61@cs.ucsd.edu"},"message":"rename calculate -> getConflictSet","distinct":false,"url":"https://api.github.com/repos/CorfuDB/CorfuDB/commits/e10c1bfb065ad9f576653a7ccb78ebf6740dfa90"},{"sha":"994719e29233ef2f48e3d740575f9492d085ed77","author":{"name":"Michael Wei","email":"1deffa2866d3eabac1401fda53395c114d2f9f61@cs.ucsd.edu"},"message":"Merge branch 'master' into Keys","distinct":false,"url":"https://api.github.com/repos/CorfuDB/CorfuDB/commits/994719e29233ef2f48e3d740575f9492d085ed77"},{"sha":"7c4e28962dbd7758bf70b4f33a49dfb9764a403b","author":{"name":"Michael Wei","email":"1deffa2866d3eabac1401fda53395c114d2f9f61@cs.ucsd.edu"},"message":"Merge pull request #386 from CorfuDB/Keys\n\nAdd conflict parameter annotation and a map for accessing the conflict objects","distinct":true,"url":"https://api.github.com/repos/CorfuDB/CorfuDB/commits/7c4e28962dbd7758bf70b4f33a49dfb9764a403b"}]}
{"actor":{"display_login":"no2chem"}}