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/54ea2f24 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54ea2f24 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54ea2f24 Branch: refs/heads/trunk Commit: 54ea2f244505b7f5b6a623f7e7b8658c712018ac Parents: 8f2a26c 13af597 Author: Marcus Eriksson <[email protected]> Authored: Thu Apr 30 12:59:41 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Apr 30 12:59:41 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
