cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [06/10] git commit: merge from 1.2
Date Wed, 19 Feb 2014 22:15:36 GMT
merge from 1.2


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

Branch: refs/heads/cassandra-2.0
Commit: c0ff52e5b4e19be0a8a594942b0e9c7e454e1735
Parents: a212516 b684937
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Feb 19 16:15:10 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Feb 19 16:15:10 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                               |  1 +
 src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 83b03de,11fcf18..4fffb9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,7 +1,25 @@@
 -1.2.16
 +2.0.6
 + * Allow repairing between specific replicas (CASSANDRA-6440)
 + * Allow per-dc enabling of hints (CASSANDRA-6157)
 + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
 + * Fix EstimatedHistogram races (CASSANDRA-6682)
 + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
 + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
 + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
 + * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
 + * Expose bulk loading progress over JMX (CASSANDRA-4757)
 + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
 + * Account for range/row tombstones in tombstone drop
 +   time histogram (CASSANDRA-6522)
 + * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
 + * Make commitlog failure handling configurable (CASSANDRA-6364)
 + * Avoid overlaps in LCS (CASSANDRA-6688)
 + * Improve support for paginating over composites (CASSANDRA-4851)
 + * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
 + * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
 + * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
 +Merged from 1.2:
+  * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
 - * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 
 -   (CASSANDRA-6732)
   * Fix broken streams when replacing with same IP (CASSANDRA-6622)
   * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
   * Fix partition and range deletes not triggering flush (CASSANDRA-6655)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message