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/0c051a46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c051a46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c051a46 Branch: refs/heads/cassandra-3.0 Commit: 0c051a46c54fd1a2f151e1a68f4556faca02be8d Parents: 80e6879 4acc3a6 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Oct 12 15:13:21 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Oct 12 15:13:21 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------