Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/net/MessagingService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d821a1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d821a1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d821a1e
Branch: refs/heads/trunk
Commit: 5d821a1ea4f87679a8dfc4c8efd2c649990e1594
Parents: 2fa3321 68444f9
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Apr 25 12:38:27 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Apr 25 12:38:27 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/5d821a1e/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d821a1e/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index c23f566,824ac90..32b0705
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -212,10 -191,7 +212,11 @@@ public final class MessagingService imp
put(Verb.INDEX_SCAN, IndexScanCommand.serializer);
put(Verb.REPLICATION_FINISHED, null);
put(Verb.COUNTER_MUTATION, CounterMutation.serializer);
+ put(Verb.SNAPSHOT, SnapshotCommand.serializer);
+ put(Verb.ECHO, EchoMessage.serializer);
+ put(Verb.PAXOS_PREPARE, Commit.serializer);
+ put(Verb.PAXOS_PROPOSE, Commit.serializer);
+ put(Verb.PAXOS_COMMIT, Commit.serializer);
}};
/**
