You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2019/01/14 17:41:54 UTC

[cassandra] branch trunk updated (3dcde08 -> f8e3264)

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

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


    from 3dcde08  Ninja: Remove CI-intended in-JVM dtest code
     new 6506684  Update release checksum algorithms to SHA-256, SHA-512
     new 900292b  Merge branch 'cassandra-2.1' into cassandra-2.2
     new 24a708d  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 6a7aa0f  Merge branch 'cassandra-3.0' into cassandra-3.11
     new f8e3264  Merge branch 'cassandra-3.11' into trunk

The 5 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 ++
 build.xml   | 8 ++++----
 2 files changed, 6 insertions(+), 4 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 ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f8e32649a392317e980beff7e2426af3bd9444ff
Merge: 3dcde08 6a7aa0f
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Mon Jan 14 11:40:11 2019 -0600

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt | 2 ++
 build.xml   | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 32217d9,a442f11..ba44dcf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -370,8 -30,12 +370,10 @@@ Merged from 3.0
   * sstableloader should use discovered broadcast address to connect intra-cluster (CASSANDRA-14522)
   * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
   Merged from 2.2:
 - * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * MigrationManager attempts to pull schema from different major version nodes (CASSANDRA-14928)
 - * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
+ Merged from 2.1:
+  * Update release checksum algorithms to SHA-256, SHA-512 (CASSANDRA-14970)
  
  
  3.11.3


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