Merge branch 'cassandra-3.11' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1188fcb0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1188fcb0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1188fcb0

Branch: refs/heads/trunk
Commit: 1188fcb082a4b4ecbef4ab9b6a2c42261ddd08f5
Parents: 66b2b3f f6ec5c5
Author: Jason Brown <jasedbr...@gmail.com>
Authored: Mon Feb 12 05:15:38 2018 -0800
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Mon Feb 12 05:16:46 2018 -0800

----------------------------------------------------------------------
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 bin/debug-cql | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1188fcb0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4c48287,bce7e1d..c8eb6f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -207,7 -19,9 +207,8 @@@
   * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
   * Update jackson JSON jars (CASSANDRA-13949)
   * Avoid locks when checking LCS fanout and if we should defrag 
(CASSANDRA-13930)
 - * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
  Merged from 3.0:
+  * Add MinGW uname check to start scripts (CASSANDRA-12840)
   * Use the correct digest file and reload sstable metadata in nodetool verify 
(CASSANDRA-14217)
   * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
   * Set encoding for javadoc generation (CASSANDRA-14154)


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

Reply via email to