Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7604935e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7604935e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7604935e Branch: refs/heads/trunk Commit: 7604935efe871e9bd458389c4116c492e9cbc7d7 Parents: f05870e 55b5605 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Feb 11 09:23:08 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Feb 11 09:23:08 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
