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/20364f48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20364f48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20364f48 Branch: refs/heads/trunk Commit: 20364f486f1442fccf134ee75ccab1151c0a102c Parents: 0d4065e f797bfa Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Wed Jun 24 12:11:10 2015 -0400 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Wed Jun 24 12:11:10 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
