cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 06 Aug 2015 13:29:19 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bfc6423
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bfc6423
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bfc6423

Branch: refs/heads/trunk
Commit: 0bfc6423c2ae6b11a76221943844fba67faa0d0c
Parents: fe8fbc8 0dd50a6
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Aug 6 08:28:38 2015 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Aug 6 08:28:38 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../db/compaction/CompactionManager.java        |  19 +-
 .../compaction/CompactionStrategyManager.java   |  24 +-
 .../apache/cassandra/net/MessagingService.java  |   6 +
 .../org/apache/cassandra/repair/RepairJob.java  |  17 +-
 .../apache/cassandra/repair/RepairJobDesc.java  |  41 +-
 .../repair/RepairMessageVerbHandler.java        |   4 +-
 .../apache/cassandra/repair/RepairRunnable.java |  45 +-
 .../apache/cassandra/repair/RepairSession.java  |  48 +-
 .../cassandra/repair/RepairSessionResult.java   |   6 +-
 .../org/apache/cassandra/repair/SyncTask.java   |   6 +-
 .../repair/SystemDistributedKeyspace.java       |  27 +-
 .../apache/cassandra/repair/TreeResponse.java   |   8 +-
 .../apache/cassandra/repair/ValidationTask.java |  14 +-
 .../org/apache/cassandra/repair/Validator.java  |  83 +--
 .../repair/messages/ValidationComplete.java     |  47 +-
 .../cassandra/service/ActiveRepairService.java  |   4 +-
 .../org/apache/cassandra/utils/MerkleTrees.java | 434 +++++++++++++++
 .../serialization/3.0/gms.EndpointState.bin     | Bin 0 -> 73 bytes
 test/data/serialization/3.0/gms.Gossip.bin      | Bin 0 -> 158 bytes
 .../serialization/3.0/service.SyncComplete.bin  | Bin 0 -> 362 bytes
 .../serialization/3.0/service.SyncRequest.bin   | Bin 0 -> 219 bytes
 .../3.0/service.ValidationComplete.bin          | Bin 0 -> 1251 bytes
 .../3.0/service.ValidationRequest.bin           | Bin 0 -> 167 bytes
 .../cassandra/AbstractSerializationsTester.java |   3 +-
 .../LeveledCompactionStrategyTest.java          |   2 +-
 .../cassandra/repair/LocalSyncTaskTest.java     |  23 +-
 .../cassandra/repair/RepairSessionTest.java     |   3 +-
 .../apache/cassandra/repair/ValidatorTest.java  |  19 +-
 .../cassandra/service/SerializationsTest.java   |  28 +-
 .../apache/cassandra/utils/MerkleTreeTest.java  |   1 -
 .../apache/cassandra/utils/MerkleTreesTest.java | 538 +++++++++++++++++++
 32 files changed, 1256 insertions(+), 195 deletions(-)
----------------------------------------------------------------------



Mime
View raw message