You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/12/04 00:30:26 UTC
[1/3] cassandra git commit: Fix streaming completion in the non-MV
case
Repository: cassandra
Updated Branches:
refs/heads/trunk c19aa154a -> 79f4bdb20
Fix streaming completion in the non-MV case
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-10803
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/814bc706
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/814bc706
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/814bc706
Branch: refs/heads/trunk
Commit: 814bc7065e05e09c6a3a8992906fc8be1fa03074
Parents: bc9a61f
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Dec 3 17:28:33 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Dec 3 17:28:33 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/814bc706/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
index dfc91f9..0230d14 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java
@@ -209,9 +209,9 @@ public class StreamReceiveTask extends StreamTask
cfs.keyspace.getName(), cfs.getTableName());
}
}
- task.session.taskCompleted(task);
}
}
+ task.session.taskCompleted(task);
}
catch (Throwable t)
{
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79f4bdb2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79f4bdb2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79f4bdb2
Branch: refs/heads/trunk
Commit: 79f4bdb20a945f301ce34723ca94863244c4f48a
Parents: c19aa15 29c653d
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Dec 3 17:30:12 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Dec 3 17:30:12 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29c653de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29c653de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29c653de
Branch: refs/heads/trunk
Commit: 29c653de66b689939ea21f56080f88f6f3946dc6
Parents: 2a33c3b 814bc70
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Dec 3 17:29:48 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Dec 3 17:29:48 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------