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/a6e7d140 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6e7d140 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6e7d140 Branch: refs/heads/trunk Commit: a6e7d1405ad34127948538a866ef6fd027bf940d Parents: 7604935 9381b8d Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Feb 11 13:14:28 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Feb 11 13:14:28 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------