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/b8f20117 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8f20117 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8f20117 Branch: refs/heads/cassandra-3.0 Commit: b8f201172ee8511d745b83940b991f8586cc1a4d Parents: d689da3 5a923f6 Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Thu May 5 18:04:12 2016 -0400 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Thu May 5 18:04:12 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------