Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/trunk
Commit: ade38b20740b8ce2e626e256d2e2f934a3024a16
Parents: 4bc3aa9 465496f
Author: Nate McCall <zznat...@gmail.com>
Authored: Tue Sep 20 14:13:10 2016 +1200
Committer: Nate McCall <zznat...@gmail.com>
Committed: Tue Sep 20 14:15:03 2016 +1200

----------------------------------------------------------------------
 CHANGES.txt                                                       | 3 ++-
 .../org/apache/cassandra/transport/RequestThreadPoolExecutor.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ade38b20/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b61c76c,6c5fded..6759897
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -78,10 -22,13 +78,11 @@@ Merged from 2.2
   * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
   * Synchronize ThriftServer::stop() (CASSANDRA-12105)
   * Use dedicated thread for JMX notifications (CASSANDRA-12146)
 - * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143)
   * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
 - * Don't write shadowed range tombstone (CASSANDRA-12030)
  Merged from 2.1:
-  * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
+  * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
+  * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127) 
   * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
   * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
   * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)

Reply via email to