Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0c90e07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0c90e07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0c90e07 Branch: refs/heads/trunk Commit: d0c90e07ab3fea2aff80e73fa3bc58bef756ad68 Parents: 371507a 58bb974 Author: Marcus Eriksson <[email protected]> Authored: Tue Jun 3 08:01:50 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jun 3 08:01:50 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/streaming/StreamReader.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0c90e07/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c7c6877,37105f3..188326d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,19 +1,10 @@@ -2.0.9 +2.1.0 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) +Merged from 2.0: * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) - * Add conditional CREATE/DROP USER support (CASSANDRA-7264) - * Swap local and global default read repair chances (CASSANDRA-7320) - * Add missing iso8601 patterns for date strings (CASSANDRA-6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) - * Add authentication support to shuffle (CASSANDRA-6484) - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) Merged from 1.2: - * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0c90e07/src/java/org/apache/cassandra/streaming/StreamReader.java ----------------------------------------------------------------------
