cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/8] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 18 Feb 2014 17:37:05 GMT
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/57ac2f8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57ac2f8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57ac2f8a

Branch: refs/heads/trunk
Commit: 57ac2f8a97d03b8a702a9c98640f7786b5cfac6e
Parents: ba23b82 9416baa
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Feb 18 11:36:50 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Feb 18 11:36:50 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/service/ActiveRepairService.java  | 36 +++++++++++++++++--
 .../cassandra/service/StorageService.java       | 17 ++++-----
 .../cassandra/service/StorageServiceMBean.java  |  4 +--
 .../org/apache/cassandra/tools/NodeProbe.java   | 16 ++++-----
 .../org/apache/cassandra/tools/NodeTool.java    | 10 ++++--
 .../service/AntiEntropyServiceTestAbstract.java | 37 +++++++++++++++++---
 7 files changed, 95 insertions(+), 26 deletions(-)
----------------------------------------------------------------------



Mime
View raw message