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/e9657a43 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9657a43 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9657a43 Branch: refs/heads/trunk Commit: e9657a43a8a64c1c273c15c166e88672cd0e55aa Parents: ecb4ae8 e614433 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue May 10 16:00:59 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue May 10 16:00:59 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9657a43/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index af8be97,2bb3518..306f46f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,11 -13,9 +37,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: + * 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) * Change order of directory searching for cassandra.in.sh to favor local one (CASSANDRA-11628)
