You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2018/01/22 13:35:13 UTC
[06/15] 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/aa831c98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa831c98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa831c98
Branch: refs/heads/trunk
Commit: aa831c98f7a6268046915036bdc2d2f3b537dd78
Parents: 503aec7 5ba9e6d
Author: Stefan Podkowinski <st...@1und1.de>
Authored: Mon Jan 22 14:18:24 2018 +0100
Committer: Stefan Podkowinski <st...@1und1.de>
Committed: Mon Jan 22 14:19:57 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
redhat/cassandra.spec | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa831c98/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 055a35d,e17093d..0f6e61c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,10 +1,28 @@@
-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)
+ * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181)
-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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa831c98/redhat/cassandra.spec
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org