Updated Branches: refs/heads/cassandra-1.2 49ec3e804 -> 68444f9b2 refs/heads/trunk 2fa332176 -> 5d821a1ea
Fix repair -snapshot not working patch by yukim; reviewed by jbellis for CASSANDRA-5512 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68444f9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68444f9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68444f9b Branch: refs/heads/cassandra-1.2 Commit: 68444f9b2f573425bdd38b378e14cd6a8c16821c Parents: 49ec3e8 Author: Yuki Morishita <[email protected]> Authored: Thu Apr 25 12:35:18 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Apr 25 12:35:18 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/MessagingService.java | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68444f9b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3d43fe6..d1b59bb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ * Don't provide oldCfId for post-1.1 system cfs (CASSANDRA-5490) * Fix primary range ignores replication strategy (CASSANDRA-5424) * Fix shutdown of binary protocol server (CASSANDRA-5507) + * Fix repair -snapshot not working (CASSANDRA-5512) Merged from 1.1 * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) * Use allocator information to improve memtable memory usage estimate http://git-wip-us.apache.org/repos/asf/cassandra/blob/68444f9b/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index cdc8b83..824ac90 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -191,6 +191,7 @@ public final class MessagingService implements MessagingServiceMBean put(Verb.INDEX_SCAN, IndexScanCommand.serializer); put(Verb.REPLICATION_FINISHED, null); put(Verb.COUNTER_MUTATION, CounterMutation.serializer); + put(Verb.SNAPSHOT, SnapshotCommand.serializer); }}; /**
