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/25a1e896 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a1e896 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25a1e896 Branch: refs/heads/cassandra-3.1 Commit: 25a1e8960cdc7c7558e1ec7e34e7b8e22cfde152 Parents: 3864b21 1b81ad1 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Dec 1 13:55:07 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Tue Dec 1 13:55:07 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
