You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/08/05 14:47:50 UTC
[1/2] git commit: Fix CQLTester cleanup
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8a3fc0292 -> 3612b84c6
Fix CQLTester cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d211608
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d211608
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d211608
Branch: refs/heads/cassandra-2.1
Commit: 2d211608e4e8b334fbfe2c8b69880287377f99f5
Parents: a3d8375a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 5 14:44:41 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 5 14:45:10 2014 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d211608/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 3363e16..f3d0a6f 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -85,7 +85,7 @@ public abstract class CQLTester
currentTypes.clear();
// We want to clean up after the test, but dropping a table is rather long so just do that asynchronously
- StorageService.tasks.execute(new Runnable()
+ StorageService.optionalTasks.execute(new Runnable()
{
public void run()
{
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.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/3612b84c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3612b84c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3612b84c
Branch: refs/heads/cassandra-2.1
Commit: 3612b84c69180c47cca9898f48ac0ae869c94711
Parents: 8a3fc02 2d21160
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 5 14:47:42 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 5 14:47:42 2014 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------