Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02a7c342 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02a7c342 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02a7c342 Branch: refs/heads/trunk Commit: 02a7c342922a209ac7374f2f425c783a5faf8538 Parents: 14d7a63 bd4a9d1 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Sun Jun 28 11:39:53 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Sun Jun 28 11:39:53 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------