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/a5930afa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5930afa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5930afa Branch: refs/heads/cassandra-2.2 Commit: a5930afa35b56742cae9118054f96d7e0bec8cc3 Parents: c7a2597 ad1dcef Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jul 21 10:19:06 2016 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jul 21 10:19:06 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
