Updated Branches: refs/heads/trunk 7cb3b7395 -> a4add9573
Fix License headers and add assert which was missed. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4add957 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4add957 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4add957 Branch: refs/heads/trunk Commit: a4add95732163ffe9b15f49ffd250379872d47e4 Parents: 5799897 Author: Vijay Parthasarathy <[email protected]> Authored: Thu Jun 28 14:45:21 2012 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Thu Jun 28 14:45:21 2012 -0700 ---------------------------------------------------------------------- .../cassandra/db/commitlog/CommitLogArchiver.java | 2 +- .../db/commitlog/CommitLogDescriptor.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4add957/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java index b8c8dfb..b109db5 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java @@ -1,4 +1,3 @@ -package org.apache.cassandra.db.commitlog; /* * * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +18,7 @@ package org.apache.cassandra.db.commitlog; * under the License. * */ +package org.apache.cassandra.db.commitlog; import java.io.File; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4add957/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 1d67f5c..b31c1e4 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java @@ -1,4 +1,3 @@ -package org.apache.cassandra.db.commitlog; /* * * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +18,7 @@ package org.apache.cassandra.db.commitlog; * under the License. * */ +package org.apache.cassandra.db.commitlog; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -75,6 +75,7 @@ public class CommitLogDescriptor public int getMessagingVersion() { + assert MessagingService.current_version == MessagingService.VERSION_12; switch (version) { case LEGACY_VERSION:
