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/7afb97cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7afb97cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7afb97cb Branch: refs/heads/trunk Commit: 7afb97cb664708e2f2874c80c628f7989f1c4fdb Parents: a2074b8 af20226 Author: Ariel Weisberg <aweisb...@apple.com> Authored: Thu Jun 29 16:11:31 2017 -0400 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Thu Jun 29 16:11:31 2017 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afb97cb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bab91e7,52b0027..096dfa4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,6 +1,7 @@@ -3.0.15 +3.11.1 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afb97cb/bin/cassandra ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
