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/ec1772ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec1772ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec1772ad Branch: refs/heads/cassandra-3.0 Commit: ec1772ad879ad8dac247a8d1fe32c3ece45c5e62 Parents: fb20023 ae03066 Author: T Jake Luciani <[email protected]> Authored: Tue Apr 26 12:18:10 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Tue Apr 26 12:18:10 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
