Merge branch 'cassandra-2.2' into cassandra-3.0 * cassandra-2.2: Revert CASSANDRA-11427 because of CASSANDRA-12351 (CASSANDRA-12143).
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5acfce66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5acfce66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5acfce66 Branch: refs/heads/cassandra-3.0 Commit: 5acfce66601c76cc280e2a05562415948bd3a538 Parents: c6cb31e f28631e Author: Sylvain Lebresne <[email protected]> Authored: Tue Aug 2 15:54:55 2016 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Aug 2 15:54:55 2016 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
