cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 18 Apr 2013 17:42:57 GMT
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/sstable/Descriptor.java
	test/unit/org/apache/cassandra/streaming/BootstrapTest.java


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

Branch: refs/heads/trunk
Commit: 29974346a4fb50ee9c8b65ade7fbdafe32f411dd
Parents: 116d907 9fc071a
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Thu Apr 18 10:42:25 2013 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Thu Apr 18 10:42:25 2013 -0700

----------------------------------------------------------------------
 .../apache/cassandra/io/sstable/Descriptor.java    |    2 +-
 .../apache/cassandra/streaming/BootstrapTest.java  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29974346/src/java/org/apache/cassandra/io/sstable/Descriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/Descriptor.java
index c8c87c2,f21a0d5..803969e
--- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java
+++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java
@@@ -47,7 -47,7 +47,7 @@@ public class Descripto
      public static class Version
      {
          // This needs to be at the begining for initialization sake
-         private static final String current_version = "ja";
 -        public static final String current_version = "ib";
++        public static final String current_version = "ja";
  
          public static final Version LEGACY = new Version("a"); // "pre-history"
          // b (0.7.0): added version to sstable filenames


Mime
View raw message