You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2018/01/15 14:07:51 UTC
[17/23] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
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/503aec74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/503aec74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/503aec74
Branch: refs/heads/cassandra-3.11
Commit: 503aec74a56a5aada7398bf38b67ceb8743b027e
Parents: b800f3c f8d73a3
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Jan 15 05:58:04 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Jan 15 06:01:14 2018 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh.py | 8 ++++++--
pylib/cqlshlib/copyutil.py | 8 ++++----
pylib/cqlshlib/cql3handling.py | 20 ++++++++++++++++++++
pylib/cqlshlib/displaying.py | 1 +
pylib/cqlshlib/formatting.py | 13 +++++++++++++
pylib/cqlshlib/pylexotron.py | 1 +
pylib/cqlshlib/wcwidth.py | 3 +++
8 files changed, 50 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/503aec74/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 266ed14,6e1ca85..055a35d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,9 +1,27 @@@
-2.1.20
+2.2.12
+ * Fix the inspectJvmOptions startup check (CASSANDRA-14112)
+ * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801)
+ * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006)
+ * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873)
++Merged from 2.1:
+ * More PEP8 compliance for cqlsh (CASSANDRA-14021)
-2.1.19
+2.2.11
+ * Safely handle empty buffers when outputting to JSON (CASSANDRA-13868)
+ * Copy session properties on cqlsh.py do_login (CASSANDRA-13847)
+ * Fix load over calculated issue in IndexSummaryRedistribution (CASSANDRA-13738)
+ * Fix compaction and flush exception not captured (CASSANDRA-13833)
+ * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809)
+ * Uncaught exceptions in Netty pipeline (CASSANDRA-13649)
+ * 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:
* Add storage port options to sstableloader (CASSANDRA-13844)
- * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775)
+ * 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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org