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/97a43fff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a43fff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a43fff Branch: refs/heads/trunk Commit: 97a43ffff2610f5f57678c69ca674b7d795c36b4 Parents: 77ab773 209ebd3 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Apr 19 15:48:52 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Apr 19 15:48:52 2016 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
