cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: merge from 2.0
Date Thu, 19 Sep 2013 21:54:37 GMT
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 681312393b03be50e000c5ffeb2e6e3ff2672f1b
Parents: fee30d5 023b55f
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Sep 19 16:54:26 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Sep 19 16:54:26 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   8 ++-----
 build.xml                                       |   4 ++--
 lib/thrift-server-0.3.0.jar                     | Bin 123898 -> 0 bytes
 lib/thrift-server-0.3.2.jar                     | Bin 0 -> 123920 bytes
 .../cassandra/io/sstable/SSTableReader.java     |  14 ++++++++++---
 .../io/util/BufferedSegmentedFile.java          |  21 ++++++++-----------
 6 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/68131239/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2b5bf79,a6938f4..578da35
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,4 +1,12 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
- 2.0.2
+ 2.0.1
   * Improve memory use defaults (CASSANDRA-5069)
   * Make ThriftServer more easlly extensible (CASSANDRA-6058)
   * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/68131239/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d0bb1c5,72291e2..5be37ca
--- a/build.xml
+++ b/build.xml
@@@ -355,9 -354,7 +355,9 @@@
            <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
            <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib"
version="1.1.2"/>
            <dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
- 	      <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0">
 -	   <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
++          <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2">
 +	      	<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
 +          </dependency>
            <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
            <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"/>
  
@@@ -456,10 -452,11 +456,10 @@@
          <dependency groupId="edu.stanford.ppl" artifactId="snaptree"/>
          <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
          <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
-         <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
+         <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
  
 -        <dependency groupId="log4j" artifactId="log4j"/>
 -        <!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider
at runtime -->
 -        <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="runtime"/>
 +        <dependency groupId="ch.qos.logback" artifactId="logback-core"/>
 +        <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
  
          <dependency groupId="org.apache.thrift" artifactId="libthrift"/>
          <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift"/>


Mime
View raw message