cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [12/15] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Wed, 13 Aug 2014 15:34:22 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1.0
Commit: f0676173413b6566aaadf2429eb4911bd1f4d7ee
Parents: 5d66322 7c46fd4
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Aug 13 10:33:13 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Aug 13 10:33:13 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/f0676173/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b270f85,53d3297..2913607
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -148,46 -51,22 +148,48 @@@ 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)
  
  
 -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)
 +2.1.0-rc1
 + * Revert flush directory (CASSANDRA-6357)
 + * More efficient executor service for fast operations (CASSANDRA-4718)
 + * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
 + * Support more concurrent requests in native protocol (CASSANDRA-7231)
 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
 + * Change concurrent_compactors defaults (CASSANDRA-7139)
 + * Add PowerShell Windows launch scripts (CASSANDRA-7001)
 + * Make commitlog archive+restore more robust (CASSANDRA-6974)
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot "manifest" describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 + * Fix repair hang when given CF does not exist (CASSANDRA-7189)
 + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
 + * Add server side batching to native transport (CASSANDRA-5663)
 + * Make batchlog replay asynchronous (CASSANDRA-6134)
 + * remove unused classes (CASSANDRA-7197)
 + * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
 + * Add validate method to CollectionType (CASSANDRA-7208)
 + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
 + * Fix nodetool netstats (CASSANDRA-7270)
 + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
 + * Use prepared statements internally (CASSANDRA-6975)
 + * Fix broken paging state with prepared statement (CASSANDRA-7120)
 + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
 + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
 + * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
 + * Handle overlapping MultiSlices (CASSANDRA-7279)
 + * Fix DataOutputTest on Windows (CASSANDRA-7265)
 + * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)
 + * Add tuple type to CQL/native protocol (CASSANDRA-7248)
 + * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322)
 +Merged from 2.0:
   * 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)

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


Mime
View raw message