You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2017/02/03 20:21:19 UTC
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8dfeb23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8dfeb23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8dfeb23
Branch: refs/heads/cassandra-3.11
Commit: d8dfeb2354a35ac6987a13a72a6d2c20f5a2cb23
Parents: 48cfe7d cc384a5
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Feb 3 15:19:32 2017 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Feb 3 15:19:32 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 19 ++++++++++++++++++-
.../apache/cassandra/db/ColumnFamilyStore.java | 4 ++--
2 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8dfeb23/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index be749aa,1d6b53c..d0134e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -195,19 -86,6 +195,20 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * Fix speculative retry bugs (CASSANDRA-13009)
+ * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
+ * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856)
+ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
+ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
@@@ -339,12 -208,6 +356,12 @@@ Merged from 2.2
* 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:
+ * 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)
++ * 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)
+ * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
* Don't try to get sstables for non-repairing column families (CASSANDRA-12077)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8dfeb23/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------