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/58927321 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58927321 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58927321 Branch: refs/heads/trunk Commit: 5892732149f05693385a74eb74ba4c235b546eb9 Parents: c1e7643 b6dd6b4 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Jun 30 13:22:43 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Jun 30 13:22:43 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
