Updated Branches: refs/heads/trunk 87d5c019c -> 5fd463184
Add missing CommitLogDescriptor version 21. Patch by cmolter, reviewed by marcuse for CASSANDRA-5984. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd46318 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd46318 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd46318 Branch: refs/heads/trunk Commit: 5fd463184b334088928e30886685ef583812c00d Parents: 87d5c01 Author: Marcus Eriksson <marc...@spotify.com> Authored: Sun Sep 8 19:19:58 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Sun Sep 8 19:19:58 2013 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/db/commitlog/CommitLogDescriptor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fd46318/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java index 0f5f1dd..507c1ca 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java @@ -35,11 +35,12 @@ public class CommitLogDescriptor public static final int VERSION_12 = 2; public static final int VERSION_20 = 3; + public static final int VERSION_21 = 4; /** * Increment this number if there is a changes in the commit log disc layout or MessagingVersion changes. * Note: make sure to handle {@link #getMessagingVersion()} */ - public static final int current_version = VERSION_20; + public static final int current_version = VERSION_21; private final int version; public final long id; @@ -77,6 +78,8 @@ public class CommitLogDescriptor return MessagingService.VERSION_12; case VERSION_20: return MessagingService.VERSION_20; + case VERSION_21: + return MessagingService.VERSION_21; default: throw new IllegalStateException("Unknown commitlog version " + version); }
