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/2a127138 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a127138 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a127138 Branch: refs/heads/cassandra-3.1 Commit: 2a1271382a65095941583935a5de3b4d2031b736 Parents: 79bf03d 9f02182 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:48:50 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:48:50 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
