You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/12/07 11:56:34 UTC
[1/2] git commit: Fix test build
Updated Branches:
refs/heads/cassandra-2.0 3c15ff2e4 -> 2ccb3da7c
Fix test build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/faa9d51a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/faa9d51a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/faa9d51a
Branch: refs/heads/cassandra-2.0
Commit: faa9d51a60cf91a2ab479aa84524a56e68c4ebe9
Parents: 510eabf
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Dec 7 13:54:41 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Dec 7 13:54:41 2013 +0300
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/faa9d51a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 2c055c7..c8af0d0 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -244,7 +244,7 @@ public class DirectoriesTest
for (final String cf : CFS)
{
final Directories directories = Directories.create(KS, cf);
- Assert.assertEquals(cfDir(cf), directories.getDirectoryForNewSSTables(0));
+ Assert.assertEquals(cfDir(cf), directories.getDirectoryForNewSSTables());
final String n = Long.toString(System.nanoTime());
Callable<File> directoryGetter = new Callable<File>() {
public File call() throws Exception {
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ccb3da7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ccb3da7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ccb3da7
Branch: refs/heads/cassandra-2.0
Commit: 2ccb3da7cd238110403d03bfebe46d6e4ed1be23
Parents: 3c15ff2 faa9d51
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Dec 7 13:55:59 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Dec 7 13:55:59 2013 +0300
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ccb3da7/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------