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/10/24 14:16:01 UTC

[cassandra] branch cassandra-3.11 updated (1c3394d -> 94577bc)

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

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


    from 1c3394d  Merge branch 'cassandra-3.0' into cassandra-3.11
     new f00e01f  Prepare for release, set version build date
     new b2ed5c1  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 98f56c1  Prepare for release, set version build date, fix whitespace
     new 39879b0  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 94577bc  Prepare for release, set version build date, fix whitespace/typo

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 +-
 NEWS.txt         | 4 ++--
 debian/changelog | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


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


[cassandra] 02/02: Prepare for release, set version build date, fix whitespace/typo

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

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

commit 94577bc4dc7f33fe5b36bcf5498e08c5011fe4fa
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Thu Oct 24 09:00:41 2019 -0500

    Prepare for release, set version build date, fix whitespace/typo
---
 CHANGES.txt      | 2 +-
 NEWS.txt         | 4 ++--
 debian/changelog | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3614071..c0c02ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@
  * 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)
-Merged from 3.0:a
+Merged from 3.0:
  * 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)
diff --git a/NEWS.txt b/NEWS.txt
index 2aa6deb..68dbeb7 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -47,8 +47,8 @@ using the provided 'sstableupgrade' tool.
 
 Upgrading
 ---------
-	- repair_session_max_tree_depth setting has been added to cassandra.yaml to allow operators to reduce
-	  merkle tree size if repair is creating too much heap pressure. See CASSANDRA-14096 for details.
+    - repair_session_max_tree_depth setting has been added to cassandra.yaml to allow operators to reduce
+      merkle tree size if repair is creating too much heap pressure. See CASSANDRA-14096 for details.
     - native_transport_max_negotiable_protocol_version has been added to cassandra.yaml to allow operators to
       enforce an upper limit on the version of the native protocol that servers will negotiate with clients. 
       This can be used during upgrades from 2.1 to 3.0 to prevent errors due to incompatible paging state formats
diff --git a/debian/changelog b/debian/changelog
index b9775bf..bf1d4d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ cassandra (3.11.5) unstable; urgency=medium
 
   * New release
 
- -- Michael Shuler <ms...@apache.org>  Mon, 11 Feb 2019 21:12:23 -0600
+ -- Michael Shuler <ms...@apache.org>  Thu, 24 Oct 2019 08:59:29 -0500
 
 cassandra (3.11.4) unstable; urgency=medium
 


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


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

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

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

commit 39879b0313b27f9cc0c72ec454768533cd70b456
Merge: 1c3394d 98f56c1
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Thu Oct 24 08:57:59 2019 -0500

    Merge branch 'cassandra-3.0' into cassandra-3.11



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