You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by zz...@apache.org on 2016/09/20 02:32:55 UTC
[49/50] [abbrv] cassandra git commit: Merge branch 'cassandra-3.0'
into cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb371ead
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb371ead
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb371ead
Branch: refs/heads/cassandra-3.9
Commit: bb371eadacb1dee81aa099ad3b18e61aa804dbae
Parents: c11c7d7 ade38b2
Author: Nate McCall <zz...@gmail.com>
Authored: Tue Sep 20 14:16:00 2016 +1200
Committer: Nate McCall <zz...@gmail.com>
Committed: Tue Sep 20 14:17:50 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/bb371ead/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e849d28,6759897..8628348
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -93,13 -80,9 +93,14 @@@ Merged from 2.2
* Use dedicated thread for JMX notifications (CASSANDRA-12146)
* 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)
+ * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
+ * Validate bloom_filter_fp_chance against lowest supported
+ value when the table is created (CASSANDRA-11920)
+ * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
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)