Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db6b563f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db6b563f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db6b563f Branch: refs/heads/trunk Commit: db6b563f143dc5f2037244854527cafc8594e730 Parents: 2c8100a 56631e1 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Mar 3 15:04:17 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 3 15:04:17 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
