cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 15 May 2015 15:00:30 GMT
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/3476a255
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3476a255
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3476a255

Branch: refs/heads/trunk
Commit: 3476a2554f96a3d0e9d2ec4b5fd2f174a20f23ba
Parents: 054f0a1 d475528
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri May 15 17:59:32 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri May 15 17:59:32 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/PagedRangeCommand.java | 4 ++--
 src/java/org/apache/cassandra/db/RangeSliceCommand.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3476a255/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fa050cd,00cc335..80619d0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,10 +1,32 @@@
 -2.0.16:
 +2.1.6
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 +Merged from 2.0:
+  * Clone SliceQueryFilter in AbstractReadCommand implementations (CASSANDRA-8940)
   * Push correct protocol notification for DROP INDEX (CASSANDRA-9310)
   * token-generator - generated tokens too long (CASSANDRA-9300)
 -
 -
 -2.0.15:
   * Fix counting of tombstones for TombstoneOverwhelmingException (CASSANDRA-9299)
   * Fix ReconnectableSnitch reconnecting to peers during upgrade (CASSANDRA-6702)
   * Include keyspace and table name in error log for collections over the size

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3476a255/src/java/org/apache/cassandra/db/PagedRangeCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3476a255/src/java/org/apache/cassandra/db/RangeSliceCommand.java
----------------------------------------------------------------------


Mime
View raw message