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/56631e13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56631e13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56631e13 Branch: refs/heads/trunk Commit: 56631e139092d81d55ea8c7c7ddccb3ff16eef62 Parents: 0439531 ef20671 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Mar 3 15:04:10 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 3 15:04:10 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
