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/c7a25972 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7a25972 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7a25972 Branch: refs/heads/cassandra-3.9 Commit: c7a25972e9bab7188fcdf169d537edbc0020f9dd Parents: e8186fe ba06847 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jul 21 10:17:57 2016 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jul 21 10:17:57 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------