Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efebd8f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efebd8f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efebd8f1 Branch: refs/heads/trunk Commit: efebd8f172d19d3c325366201235882af7531244 Parents: 718c144 f778c1f Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Jun 19 19:36:11 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Jun 19 19:36:11 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
