cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 18 Jun 2014 19:08:13 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

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/5d25a16e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d25a16e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d25a16e

Branch: refs/heads/cassandra-2.0
Commit: 5d25a16efb1793ca8e7883f0840fd4a595f02379
Parents: 4b3a17c 20fffa9
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Jun 18 14:07:50 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Jun 18 14:07:50 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     | 1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d25a16e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8af4b3e,25ea22b..501e740
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -1.2.17
 +2.0.9
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * 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)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 +Merged from 1.2:
+  * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
   * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
   * Track metrics at a keyspace level (CASSANDRA-6539)
   * Add replace_address_first_boot flag to only replace if not bootstrapped

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d25a16e/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------


Mime
View raw message