cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/20] git commit: merge from 1.1.0
Date Wed, 11 Apr 2012 14:13:27 GMT
merge from 1.1.0


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

Branch: refs/heads/cassandra-1.1
Commit: 6564b33c76df99152f48f2408938c4af439f9344
Parents: 092dc58 c14e266
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Apr 11 09:08:06 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Apr 11 09:10:37 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    3 +++
 conf/cassandra.yaml                                |    6 ++++++
 .../org/apache/cassandra/thrift/Cassandra.java     |    4 ++++
 .../org/apache/cassandra/thrift/Constants.java     |    2 +-
 src/java/org/apache/cassandra/config/Config.java   |    1 +
 .../cassandra/config/DatabaseDescriptor.java       |    4 ++++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    3 ++-
 src/java/org/apache/cassandra/db/DefsTable.java    |    6 ++++--
 8 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
----------------------------------------------------------------------
diff --cc interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
index d68f1ca,d9b51a5..a10f936
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
@@@ -17817,6 -17733,6 +17817,8 @@@ public class Cassandra 
  
      private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
        try {
++        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
++        __isset_bit_vector = new BitSet(1);
          read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
        } catch (org.apache.thrift.TException te) {
          throw new java.io.IOException(te);
@@@ -34876,6 -34146,6 +34878,8 @@@
  
      private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
        try {
++        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
++        __isset_bit_vector = new BitSet(1);
          read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
        } catch (org.apache.thrift.TException te) {
          throw new java.io.IOException(te);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
----------------------------------------------------------------------
diff --cc interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
index 270976b,270976b..723562b
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
@@@ -44,6 -44,6 +44,6 @@@ import org.slf4j.LoggerFactory
  
  public class Constants {
  
--  public static final String VERSION = "19.30.0";
++  public static final String VERSION = "19.31.0";
  
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6564b33c/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------


Mime
View raw message