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/503a8a86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/503a8a86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/503a8a86 Branch: refs/heads/trunk Commit: 503a8a865ed60b08e6c512c206a295a6a78f2848 Parents: 861d996 9a6ae96 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Feb 10 18:35:41 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Feb 10 18:35:41 2014 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/503a8a86/test/unit/org/apache/cassandra/db/CleanupTest.java ----------------------------------------------------------------------
