You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/06/03 08:14:46 UTC
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/0a984520
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a984520
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a984520
Branch: refs/heads/trunk
Commit: 0a9845203a2b6eeca0dbe77acade6d749f0682f6
Parents: 4b437b4 0f2d7d0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Jun 3 08:13:52 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Jun 3 08:13:52 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
debian/cassandra-sysctl.conf | 1 +
.../org/apache/cassandra/repair/RepairJob.java | 15 ++++++--
.../apache/cassandra/repair/RepairSession.java | 37 ++++++++++++++++----
.../cassandra/service/ActiveRepairService.java | 1 -
.../cassandra/streaming/ConnectionHandler.java | 1 +
.../cassandra/streaming/StreamSession.java | 22 ++----------
.../cassandra/streaming/StreamTransferTask.java | 12 +++++--
8 files changed, 58 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a984520/CHANGES.txt
----------------------------------------------------------------------