Merge branch 'cassandra-2.1' into cassandra-2.2

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

Branch: refs/heads/trunk
Commit: 830b01272c227503f74b5fe5a5340331ee3ce685
Parents: 270f690 3c0c462
Author: Michael Shuler <mich...@pbandjelly.org>
Authored: Thu Aug 17 14:24:09 2017 -0500
Committer: Michael Shuler <mich...@pbandjelly.org>
Committed: Thu Aug 17 14:24:09 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 circle.yml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/830b0127/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f712333,4f8f65f..5c1d1e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.19
 - * Remove stress-test target in CircleCI as it's not existing 
(CASSANDRA-13775) 
 +2.2.11
 + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) 
 + * Fix queries with LIMIT and filtering on clustering columns 
(CASSANDRA-11223)
 + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272)
 + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
 + * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
 + * Remove unused max_value_size_in_mb config setting from yaml 
(CASSANDRA-13625
 +Merged from 2.1:
++ * Remove stress-test target in CircleCI as it's not existing 
(CASSANDRA-13775)
   * Clone HeartBeatState when building gossip messages. Make its 
generation/version volatile (CASSANDRA-13700)
  
  


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

Reply via email to