Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34bbb445 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34bbb445 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34bbb445 Branch: refs/heads/cassandra-3.0 Commit: 34bbb445cb14ba7159f735b0dee8c2f9dab45a77 Parents: 99d5c39 2a2394f Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Sep 8 13:55:03 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Sep 8 13:55:03 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------