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/37f63ecc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f63ecc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37f63ecc Branch: refs/heads/trunk Commit: 37f63ecc5d3b36fc115fd7ae98e4fc1f4bc2d1d6 Parents: 220e4f6 5c5c5b4 Author: T Jake Luciani <[email protected]> Authored: Fri Apr 15 10:34:48 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Fri Apr 15 10:34:48 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
