cassandra-commits mailing list archives

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

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 936dea8952820b4eb16b87963a86a358389321f0
Parents: a88a783 c99f37e
Author: Jason Brown <jasobrown@apple.com>
Authored: Wed Sep 3 10:48:50 2014 -0700
Committer: Jason Brown <jasobrown@apple.com>
Committed: Wed Sep 3 10:48:50 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                        |   9 +++++++++
 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, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/936dea89/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 281b63b,e93b16c..dd847cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -86,6 -65,14 +86,15 @@@ 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)
++>>>>>>> cassandra-2.1
   * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
   * Fix ALTER clustering column type from DateType to TimestampType when
     using DESC clustering order (CASSANRDA-7797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/936dea89/build.xml
----------------------------------------------------------------------


Mime
View raw message