You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2019/12/11 16:03:07 UTC

[cassandra] branch trunk updated (1ce979d -> ce877cb)

This is an automated email from the ASF dual-hosted git repository.

stefania pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 1ce979d  Merge branch 'cassandra-3.11' into trunk
     new 122cf57  Fix nodetool compactionstats showing extra pending task for TWCS
     new ce877cb  Merge branch 'cassandra-3.11' into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                        |  2 +-
 .../SizeTieredCompactionStrategyOptions.java       |  7 ++
 .../compaction/TimeWindowCompactionStrategy.java   | 77 +++++++++++++++-------
 .../org/apache/cassandra/tools/nodetool/Stop.java  |  2 +-
 .../TimeWindowCompactionStrategyTest.java          | 15 +++--
 5 files changed, 73 insertions(+), 30 deletions(-)


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


[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

stefania pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ce877cbe2b7c11355b07cac6f1996a9c9006d89f
Merge: 1ce979d 122cf57
Author: Stefania Alborghetti <st...@datastax.com>
AuthorDate: Wed Dec 11 11:00:00 2019 -0500

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt                                        |  2 +-
 .../SizeTieredCompactionStrategyOptions.java       |  7 ++
 .../compaction/TimeWindowCompactionStrategy.java   | 77 +++++++++++++++-------
 .../org/apache/cassandra/tools/nodetool/Stop.java  |  2 +-
 .../TimeWindowCompactionStrategyTest.java          | 15 +++--
 5 files changed, 73 insertions(+), 30 deletions(-)

diff --cc CHANGES.txt
index e486a43,8507656..4c4af72
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,14 @@@
 -3.11.6
 +4.0-alpha3
 + * Removed obsolete OldNetworkTopologyStrategy (CASSANDRA-13990)
 + * Align record header of FQL and audit binary log (CASSANDRA-15076)
 + * Shuffle forwarding replica for messages to non-local DC (CASSANDRA-15318)
 + * Optimise native protocol ASCII string encoding (CASSANDRA-15410)
 + * Make sure all exceptions are propagated in DebuggableThreadPoolExecutor (CASSANDRA-15332)
 + * Make it possible to resize concurrent read / write thread pools at runtime (CASSANDRA-15277)
 + * Close channels on error (CASSANDRA-15407)
 +Merged from 3.11:
+  * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409)
   * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
 - * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081)
  Merged from 3.0:
   * Avoid over-scanning data directories in LogFile.verify() (CASSANDRA-15364)
   * Bump generations and document changes to system_distributed and system_traces in 3.0, 3.11
@@@ -18,19 -18,13 +19,18 @@@ Merged from 2.2
   * Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
   * In-JVM DTest: Set correct internode message version for upgrade test (CASSANDRA-15371)
  
- 
 -3.11.5
 +4.0-alpha2
   * Fix SASI non-literal string comparisons (range operators) (CASSANDRA-15169)
 - * Make sure user defined compaction transactions are always closed (CASSANDRA-15123)
 - * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305)
 - * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903)
 - * Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866)
 + * Upgrade Guava to 27, and to java-driver 3.6.0 (from 3.4.0-SNAPSHOT) (CASSANDRA-14655)
 + * Extract an AbstractCompactionController to allow for custom implementations (CASSANDRA-15286)
 + * Move chronicle-core version from snapshot to stable, and include carrotsearch in generated pom.xml (CASSANDRA-15321)
 + * Untangle RepairMessage sub-hierarchy of messages, use new messaging (more) correctly (CASSANDRA-15163)
 + * Add `allocate_tokens_for_local_replication_factor` option for token allocation (CASSANDRA-15260)
 + * Add Alibaba Cloud Platform snitch (CASSANDRA-15092)
  Merged from 3.0:
 + * Fix various data directory prefix matching issues (CASSANDRA-13974)
 + * Minimize clustering values in metadata collector (CASSANDRA-15400)
 + * Make sure index summary redistribution does not start when compactions are paused (CASSANDRA-15265)
   * Add ability to cap max negotiable protocol version (CASSANDRA-15193)
   * Gossip tokens on startup if available (CASSANDRA-15335)
   * Fix resource leak in CompressedSequentialWriter (CASSANDRA-15340)


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