You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2018/01/22 13:35:20 UTC

[13/15] 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/b8c12fba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8c12fba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8c12fba

Branch: refs/heads/cassandra-3.11
Commit: b8c12fba064fb0b6a3b6306b2670497434471920
Parents: c181943 010c477
Author: Stefan Podkowinski <st...@1und1.de>
Authored: Mon Jan 22 14:22:10 2018 +0100
Committer: Stefan Podkowinski <st...@1und1.de>
Committed: Mon Jan 22 14:25:36 2018 +0100

----------------------------------------------------------------------
 CHANGES.txt           | 1 +
 redhat/cassandra.spec | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c12fba/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5e4c40a,0eaab6e..81b358d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,25 -25,12 +43,26 @@@ Merged from 2.2
   * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
   * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801)
   * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
 + * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
  Merged from 2.1:
 - * More PEP8 compliance for cqlsh (CASSANDRA-14021)
+  * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181)
 -
 -
 -3.0.15
 + * More PEP8 compiance for cqlsh (CASSANDRA-14021)
 +
 +
 +3.11.1
 + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems (CASSANDRA-13808)
 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a single leaf and overflow collisions (CASSANDRA-13869)
 + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798)
 + * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
 + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
   * Improve TRUNCATE performance (CASSANDRA-13909)
   * Implement short read protection on partition boundaries (CASSANDRA-13595)
   * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries (CASSANDRA-13911)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c12fba/redhat/cassandra.spec
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org