Merge branch cassandra-3.0 into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd89f562 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd89f562 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd89f562 Branch: refs/heads/cassandra-3.11 Commit: bd89f56232859d8076c8da147e983881ce09e5b7 Parents: 29db251 7de853b Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Jul 14 11:41:51 2017 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Jul 14 11:41:51 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd89f562/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 30fa350,fffda7f..e7ad6fb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -6,9 -2,11 +6,10 @@@ Merged from 3.0 * 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) - Merged from 2.2: +Merged from 2.2: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd89f562/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
