Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf40aa44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf40aa44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf40aa44 Branch: refs/heads/cassandra-2.2 Commit: bf40aa4439ef7ab53321638d86b58ff50194da31 Parents: 280da18 f5baa9c Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri May 13 21:19:54 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri May 13 21:20:01 2016 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------