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 2017/08/17 19:34:14 UTC
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0614b274
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0614b274
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0614b274
Branch: refs/heads/trunk
Commit: 0614b274faa6410904d24b81d7dd62df1dfae4c6
Parents: c2b635a 830b012
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Aug 17 14:27:03 2017 -0500
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Thu Aug 17 14:27:03 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
circle.yml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0614b274/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 358dd04,5c1d1e5..6faaa48
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,12 +1,32 @@@
-2.2.11
- * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
+3.0.15
+ * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)
+ * Fix digest calculation for counter cells (CASSANDRA-13750)
+ * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573)
+ * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)
+ * Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730)
+ * Log warn message until legacy auth tables have been migrated (CASSANDRA-13371)
+ * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
+ * Fix invalid writetime for null cells (CASSANDRA-13711)
+ * Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
+ * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
+ * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize (Backport CASSANDRA-13329)
+ * Fix Digest mismatch Exception if hints file has UnknownColumnFamily (CASSANDRA-13696)
+ * Purge tombstones created by expired cells (CASSANDRA-13643)
+ * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482)
+ * Set test.runners based on cores and memory size (CASSANDRA-13078)
+ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
+ * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
+ * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
+ * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)
+ * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
- Merged from 2.2:
++Merged from 2.2:
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0614b274/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index f4801b7,5b4c72d..a51cf25
--- a/circle.yml
+++ b/circle.yml
@@@ -7,7 -7,7 +7,7 @@@ test
- sudo apt-get update; sudo apt-get install wamerican:
parallel: true
override:
- - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test -Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant stress-test ;;esac:
- - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant long-test ;; 2) ant test-compression ;;esac:
++ - case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test -Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;;esac:
parallel: true
post:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org