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/6fcf3353 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fcf3353 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fcf3353 Branch: refs/heads/trunk Commit: 6fcf3353b65195f0b1d0c1e20c5b8d562a8d21d5 Parents: 5d0d30e 341b3fb Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jun 27 11:13:56 2016 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jun 27 11:13:56 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------