cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Mon, 02 Jun 2014 07:00:38 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e398c6bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e398c6bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e398c6bb

Branch: refs/heads/cassandra-2.1
Commit: e398c6bb89d4463e251434650e92f1c464fe9b40
Parents: 1c33ea3 709b9fc
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Jun 2 08:59:50 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Jun 2 08:59:50 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/streaming/StreamSession.java      | 32 ++++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e398c6bb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index af4da65,bc95a8d..c7c6877
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,18 +1,9 @@@
 -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)
  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/e398c6bb/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------


Mime
View raw message