cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [07/15] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 13 Aug 2014 15:34:17 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/7c46fd4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c46fd4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c46fd4f

Branch: refs/heads/cassandra-2.1
Commit: 7c46fd4f8d5e1f5fee6939d9509fc138653d8372
Parents: 40deb91 22a4629
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Aug 13 10:32:52 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Aug 13 10:32:52 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c46fd4f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 334feb5,9fad7c9..53d3297
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -51,37 -7,16 +51,39 @@@ Merged from 1.2
   * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
   * Set correct stream ID on responses when non-Exception Throwables
     are thrown while handling native protocol messages (CASSANDRA-7470)
+  * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
+  * Fix race in background compaction check (CASSANDRA-7745)
  
  
 -1.2.18
 - * Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445)
 - * Fix compilation with java 6 broke by CASSANDRA-7147
 -
 -
 -1.2.17
 +2.0.9
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * 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)
 + * Account for range tombstones in min/max column names (CASSANDRA-7235)
 + * Improve sub range repair validation (CASSANDRA-7317)
 + * Accept subtypes for function results, type casts (CASSANDRA-6766)
 + * Support DISTINCT for static columns and fix behaviour when DISTINC is
 +   not use (CASSANDRA-7305).
 + * Refuse range queries with strict bounds on compact tables since they
 +   are broken (CASSANDRA-7059)
 +Merged from 1.2:
 + * Expose global ColumnFamily metrics (CASSANDRA-7273)
   * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
   * Expose global ColumnFamily metrics (CASSANDRA-7273)
   * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c46fd4f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message