Merge commit '11716547f87f4c88a2790323744b0ed97175854d' 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/078aabe3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/078aabe3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/078aabe3 Branch: refs/heads/cassandra-3.0 Commit: 078aabe3d40bfa511642918ea6529016fe7c0620 Parents: 9ca7e16 1171654 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 6 17:56:01 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 6 17:56:01 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------