Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b897e601 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b897e601 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b897e601 Branch: refs/heads/cassandra-3.0 Commit: b897e60110634932a70be916f0d57f40020b5954 Parents: 05300b2 c8136b9 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:18:37 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:18:37 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------