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/d1e93e97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1e93e97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1e93e97 Branch: refs/heads/cassandra-3.0 Commit: d1e93e97e6ff696a4948a876452413a4b65abdbc Parents: a4c767e acdbba7 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:17:48 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:17:48 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
