Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19914dc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19914dc1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19914dc1 Branch: refs/heads/trunk Commit: 19914dc1d11ce545ade269afc2aaa2088a232c81 Parents: ebd0aae e406700 Author: Ariel Weisberg <[email protected]> Authored: Tue Jul 11 14:28:12 2017 -0400 Committer: Ariel Weisberg <[email protected]> Committed: Tue Jul 11 14:28:31 2017 -0400 ---------------------------------------------------------------------- CHANGES.txt | 7 ++++--- build.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++----- circle.yml | 2 +- 3 files changed, 58 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/19914dc1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e1589d5,dc22831..1b9d246 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -97,9 -1,11 +97,10 @@@ 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) - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) - * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) -3.0.15 + * Set test.runners based on cores and memory size (CASSANDRA-13078) + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) + * 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: * 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/19914dc1/build.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
