{"push_id":1258154931,"size":10,"distinct_size":1,"ref":"refs/heads/borshop-integration-312-nem-fwd-merge-develop-to-develop-2.2","head":"94b55d4b4c0465a460ef56e05284af4db65b9a83","before":"35842febe31f9ca63c8922aaa7bcf0b442c419a1","commits":[{"sha":"f7f7e3fc7af2acd7aa0b033366e3f1261b4c5f90","author":{"name":"Zeeshan Lakhani","email":"660c43c508636848e95bd3a5ae8c45c7596a88b5@gmail.com"},"message":"add Hyperloglog DT support and few minor test fixins\n\nStill WIP\n- Figure out correct riak_pb tag\n- Figure how best to support these changes!\n- expect buildbot tests to fail b/c live_node tests will need the new HLL shit runnin'!","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/f7f7e3fc7af2acd7aa0b033366e3f1261b4c5f90"},{"sha":"2ba569961a29adbdea460ec50214aafbd13d4fa9","author":{"name":"Zeeshan Lakhani","email":"660c43c508636848e95bd3a5ae8c45c7596a88b5@gmail.com"},"message":"update configuration","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/2ba569961a29adbdea460ec50214aafbd13d4fa9"},{"sha":"3528c501c355ad8d642328217eb60093f007b2bd","author":{"name":"Nick Marino","email":"6fe8ff32851fca8dd0c4d5102279dfa5f6f5ad2e@gmail.com"},"message":"Merge pull request #268 from basho/feature-zl-hll_datatypes\n\nadd Hyperloglog DT support and few minor test fixins","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/3528c501c355ad8d642328217eb60093f007b2bd"},{"sha":"ecaf87ca632a78bfbb4c8a91393dcfe9fb1dda57","author":{"name":"Nick Marino","email":"1fa71303c5bc7f332f7a5f1e8fb374319923f20f@basho.com"},"message":"Merge branch 'master' into nem-fwd-merge-master-to-develop\n\nConflicts:\n\tbuildbot/crdt-setup\n\trebar.config\n\tsrc/riakc_pb_socket.erl","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/ecaf87ca632a78bfbb4c8a91393dcfe9fb1dda57"},{"sha":"6325352ad6a5489f02333ae455c5468fa2f8253e","author":{"name":"Nick Marino","email":"1fa71303c5bc7f332f7a5f1e8fb374319923f20f@basho.com"},"message":"Update tools submodule to include new hll code","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/6325352ad6a5489f02333ae455c5468fa2f8253e"},{"sha":"9d699fdb0ccfcc2484972a265160d2a6e83df51f","author":{"name":"Nick Marino","email":"6fe8ff32851fca8dd0c4d5102279dfa5f6f5ad2e@gmail.com"},"message":"Merge pull request #310 from basho/nem-update-tools-for-hll\n\nUpdate tools submodule to include new hll code","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/9d699fdb0ccfcc2484972a265160d2a6e83df51f"},{"sha":"4f6dba7668aa79c30eda9854a9be3cb1683f1088","author":{"name":"Nick Marino","email":"1fa71303c5bc7f332f7a5f1e8fb374319923f20f@basho.com"},"message":"Fix incorrect bucket type name in hll unit tests\n\nSwitched this in the tools PR previously in response to review comments\n(the \"hlls\" name better matches the other bucket types for CRDTs) but\nforgot to switch the unit test code here to match.","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/4f6dba7668aa79c30eda9854a9be3cb1683f1088"},{"sha":"37ec7bd6064e007b1aafbfa73fe8486eafa1fac0","author":{"name":"Nick Marino","email":"6fe8ff32851fca8dd0c4d5102279dfa5f6f5ad2e@gmail.com"},"message":"Merge pull request #311 from basho/nem-fwd-merge-master-to-develop\n\nForward merge master to develop","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/37ec7bd6064e007b1aafbfa73fe8486eafa1fac0"},{"sha":"dd526afe13414b4abaf168c9feef470e56fc66cd","author":{"name":"Nick Marino","email":"1fa71303c5bc7f332f7a5f1e8fb374319923f20f@basho.com"},"message":"Merge branch 'develop' into nem-fwd-merge-develop-to-develop-2.2\n\nConflicts:\n\trebar.config","distinct":false,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/dd526afe13414b4abaf168c9feef470e56fc66cd"},{"sha":"94b55d4b4c0465a460ef56e05284af4db65b9a83","author":{"name":"Bishop Bors","email":"b421a94248f12d4cb0d26c0e3e2a58e47a2a5461@basho.com"},"message":"Merge pull request #312 from basho/nem-fwd-merge-develop-to-develop-2.2\n\nForward merge \"develop\" into \"develop-2.2\"\n\nReviewed-by: zeeshanlakhani","distinct":true,"url":"https://api.github.com/repos/basho/riak-erlang-client/commits/94b55d4b4c0465a460ef56e05284af4db65b9a83"}]}
{"actor":{"display_login":"borshop"}}