cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 02 May 2014 20:52:16 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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/8939ac49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8939ac49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8939ac49

Branch: refs/heads/cassandra-2.1
Commit: 8939ac49260b65091689c37de94ad65738fc666b
Parents: 3089c92 238a020
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri May 2 15:48:09 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri May 2 15:48:09 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     | 31 ++++++++++++++++++++
 .../cassandra/service/StorageService.java       |  3 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8939ac49/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 86940ea,9ab1a5f..82b0196
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,39 +1,103 @@@
 -2.0.8
 -=======
 +2.1.0-rc1
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 +Merged from 2.0:
   * Add Google Compute Engine snitch (CASSANDRA-7132)
++Merged from 1.2:
++ * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
 +
 +2.1.0-beta2
 + * Increase default CL space to 8GB (CASSANDRA-7031)
 + * Add range tombstones to read repair digests (CASSANDRA-6863)
 + * Fix BTree.clear for large updates (CASSANDRA-6943)
 + * 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, 6694)
 + * Remove adjusted op rate from stress output (CASSANDRA-6921)
 + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
 + * Serialize batchlog mutations with the version of the target node
 +   (CASSANDRA-6931)
 + * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
 + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
 + * Lock counter cells, not partitions (CASSANDRA-6880)
 + * Track presence of legacy counter shards in sstables (CASSANDRA-6888)
 + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912)
 + * Add failure handler to async callback (CASSANDRA-6747)
 + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
 + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
 + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
 + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 + * fix cassandra stress errors on reads with native protocol (CASSANDRA-7033)
 + * Use OpOrder to guard sstable references for reads (CASSANDRA-6919)
 + * Preemptive opening of compaction result (CASSANDRA-6916)
 + * Multi-threaded scrub/cleanup/upgradesstables (CASSANDRA-5547)
 + * Optimize cellname comparison (CASSANDRA-6934)
 + * Native protocol v3 (CASSANDRA-6855)
 + * Optimize Cell liveness checks and clean up Cell (CASSANDRA-7119)
 + * Support consistent range movements (CASSANDRA-2434)
 +Merged from 2.0:
   * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
   * Set JMX RMI port to 7199 (CASSANDRA-7087)
   * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
   * Log a warning for large batches (CASSANDRA-6487)
+  * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+  * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
+  * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
+  * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
+  * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
+  * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
+  * Re-add parameter columns to tracing session (CASSANDRA-6942)
+  * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
+ Merged from 1.2:
 - * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
+  * Fix nodetool display with vnodes (CASSANDRA-7082)
+  * Fix schema concurrency exceptions (CASSANDRA-6841)
+  * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
+    (CASSANDRA-6822)
+  * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+  * Schedule schema pulls on change (CASSANDRA-6971)
+  * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+  * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+  * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
+  * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
+  * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
+  * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058)
+  * Always clean up references in SerializingCache (CASSANDRA-6994)
+  * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
+  * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
+  * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
+ 
+ 
+ 2.0.7
++>>>>>>> cassandra-2.0
   * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
   * Avoid early loading of non-system keyspaces before compaction-leftovers 
     cleanup at startup (CASSANDRA-6913)

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


Mime
View raw message