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/7550ebd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7550ebd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7550ebd9 Branch: refs/heads/cassandra-3.0 Commit: 7550ebd9cca222de964ba190af3628cd3d0da1cb Parents: f13a7df c0747d2 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Wed Jan 13 14:39:49 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Wed Jan 13 14:41:40 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------