cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [05/12] git commit: merge from 2.0
Date Wed, 26 Mar 2014 15:40:46 GMT
merge from 2.0


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

Branch: refs/heads/trunk
Commit: a06adb6abd5b38e253a7afdd691d2dd5cde10007
Parents: eefa14f 33c78d5
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Mar 26 10:31:06 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Mar 26 10:31:06 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../hadoop/AbstractColumnFamilyInputFormat.java | 22 +++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a06adb6a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57c5b59,477afd9..e30ef2c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,6 +1,40 @@@
 -2.0.7
 +2.1.0-beta2
 + * Fail write instead of logging a warning when unable to append to CL
 +   (CASSANDRA-6764)
 + * Eliminate possibility of CL segment appearing twice in active list 
 +   (CASSANDRA-6557)
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 + * Fix help message for stress counter_write (CASSANDRA-6824)
 + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
 + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849)
 + * Fix race condition in Batch CLE (CASSANDRA-6860)
 + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774)
 + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781)
 + * Proper compare function for CollectionType (CASSANDRA-6783)
 + * Update native server to Netty 4 (CASSANDRA-6236)
 + * Fix off-by-one error in stress (CASSANDRA-6883)
 + * Make OpOrder AutoCloseable (CASSANDRA-6901)
 + * Remove sync repair JMX interface (CASSANDRA-6900)
 + * Add multiple memory allocation options for memtables (CASSANDRA-6689)
 +Merged from 2.0:
+  * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436)
+  * Fix NPE in MeteredFlusher (CASSANDRA-6820)
   * Fix race processing range scan responses (CASSANDRA-6820)
   * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
   * Add uuid() function (CASSANDRA-6473)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a06adb6a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------


Mime
View raw message