You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2019/12/31 14:30:53 UTC

[cassandra] branch cassandra-3.11 updated (78143bc -> 925bd0b)

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

mck pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 78143bc  Merge branch 'cassandra-3.0' into cassandra-3.11
     new de4e250  Fix sstabledump's position key value when partitions have multiple rows
     new 925bd0b  Merge branch 'cassandra-3.0' into cassandra-3.11

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                                        |  1 +
 .../apache/cassandra/tools/JsonTransformer.java    | 42 +++++++++++-----------
 2 files changed, 23 insertions(+), 20 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.0' into cassandra-3.11

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

mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 925bd0b5498e48877d594ea81a8509176666a533
Merge: 78143bc de4e250
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Dec 31 14:58:03 2019 +0100

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt                                        |  1 +
 .../apache/cassandra/tools/JsonTransformer.java    | 42 +++++++++++-----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --cc CHANGES.txt
index effc3f8,f5c4935..ec9915d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -3.0.20
 +3.11.6
 + * 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:
+  * Fix sstabledump's position key value when partitions have multiple rows (CASSANDRA-14721)
   * 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
     (CASSANDRA-15441)


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