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/4da04741 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4da04741 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4da04741 Branch: refs/heads/cassandra-3.0 Commit: 4da04741e990af18eaea3c8ca570051412cb65e8 Parents: 3a61c10 cb14186 Author: T Jake Luciani <[email protected]> Authored: Tue Jun 28 20:07:36 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Tue Jun 28 20:07:36 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
