cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [3/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 03 Sep 2014 17:49:01 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	build.xml
	lib/thrift-server-0.3.5.jar
	lib/thrift-server-0.3.6.jar


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

Branch: refs/heads/trunk
Commit: cae87157501d57b83facc1a5719b24424301f469
Parents: e75fe5c b22089d
Author: Jason Brown <jasobrown@apple.com>
Authored: Wed Sep 3 10:45:52 2014 -0700
Committer: Jason Brown <jasobrown@apple.com>
Committed: Wed Sep 3 10:45:52 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                        |   5 +++++
 build.xml                                          |   4 ++--
 lib/thrift-server-0.3.5.jar                        | Bin 39220 -> 0 bytes
 lib/thrift-server-0.3.6.jar                        | Bin 0 -> 39588 bytes
 .../cassandra/thrift/THsHaDisruptorServer.java     |  13 +++++++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cae87157/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a58af8f,4954b7f..e93b16c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -65,6 -5,10 +65,11 @@@ Merged from 2.0
   * Always reject inequality on the partition key without token()
     (CASSANDRA-7722)
   * Always send Paxos commit to all replicas (CASSANDRA-7479)
+  * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
+ 
+ 
+ 2.0.10
++>>>>>>> cassandra-2.0
   * Don't send schema change responses and events for no-op DDL
     statements (CASSANDRA-7600)
   * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cae87157/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index e678d88,f456fa8..0880975
--- a/build.xml
+++ b/build.xml
@@@ -366,11 -359,9 +366,11 @@@
              <exclusion groupId="junit" artifactId="junit"/>
            </dependency>
            <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.6"/>
 +          <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
 +          <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
-           <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.5">
++          <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.6">
 +	      	<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"/>
  
@@@ -495,12 -466,13 +495,12 @@@
          <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
          <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
          <dependency groupId="com.addthis.metrics" artifactId="reporter-config"/>
-         <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.5"/>
+         <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.6"/>
 +        <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2"
/>
          <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0"
/>
  
 -        <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