Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d4b33a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d4b33a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d4b33a5 Branch: refs/heads/trunk Commit: 4d4b33a595829f36a5839d543908f8771b36f32b Parents: 60e8d2b 676099e Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jun 26 08:33:13 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jun 26 08:33:13 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------