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/70115ff1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70115ff1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70115ff1 Branch: refs/heads/trunk Commit: 70115ff190e9d2d1187b328a8e24fc217ce9305a Parents: 05bacc7 0d8e7b1 Author: Josh McKenzie <[email protected]> Authored: Fri Jun 17 12:40:46 2016 -0400 Committer: Josh McKenzie <[email protected]> Committed: Fri Jun 17 12:40:46 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/CLibrary.java | 28 ++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70115ff1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3eb420d,2c66ef9..4c0d9a0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -79,11 -23,22 +79,12 @@@ Merged from 2.2 * cqlsh: COPY FROM should use regular inserts for single statement batches and report errors correctly if workers processes crash on initialization (CASSANDRA-11474) * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) - * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988) + * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) + * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) Merged from 2.1: + * Support mlockall on IBM POWER arch (CASSANDRA-11576) - * Cache local ranges when calculating repair neighbors (CASSANDRA-11933) - * Allow LWT operation on static column with only partition keys (CASSANDRA-10532) - * Create interval tree over canonical sstables to avoid missing sstables during streaming (CASSANDRA-11886) - * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections (CASSANDRA-11749) - * cqlsh: apply current keyspace to source command (CASSANDRA-11152) - * Backport CASSANDRA-11578 (CASSANDRA-11750) - * Clear out parent repair session if repair coordinator dies (CASSANDRA-11824) - * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840) - * Do not consider local node a valid source during replace (CASSANDRA-11848) - * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) - * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) - * Don't compute expensive MaxPurgeableTimestamp until we've verified there's an - expired tombstone (CASSANDRA-11834) * Add option to disable use of severity in DynamicEndpointSnitch (CASSANDRA-11737) * cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631) * Make cython optional in pylib/setup.py (CASSANDRA-11630) http://git-wip-us.apache.org/repos/asf/cassandra/blob/70115ff1/src/java/org/apache/cassandra/utils/CLibrary.java ----------------------------------------------------------------------
