merge from 1.0

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

Branch: refs/heads/trunk
Commit: 2a8c49b252ce734e979755d9384b74f8a2d130e5
Parents: 7c2e49e 641b021
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Mon May 21 11:50:30 2012 -0500
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Mon May 21 11:50:30 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a8c49b2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6a00d41,15f3c8a..ee4ed13
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,105 -1,12 +1,107 @@@
 -1.0.11
 +1.1.1-dev
 + * (Hadoop) fix split generation regression (CASSANDRA-4259)
 + * ignore min/max compactions settings in LCS, while preserving
 +   behavior that min=max=0 disables autocompaction (CASSANDRA-4233)
 + * log number of rows read from saved cache (CASSANDRA-4249)
 + * calculate exact size required for cleanup operations (CASSANDRA-1404)
 + * avoid blocking additional writes during flush when the commitlog
 +   gets behind temporarily (CASSANDRA-1991)
 + * enable caching on index CFs based on data CF cache setting (CASSANDRA-4197)
 + * warn on invalid replication strategy creation options (CASSANDRA-4046)
 + * remove [Freeable]Memory finalizers (CASSANDRA-4222)
 + * include tombstone size in ColumnFamily.size, which can prevent OOM
 +   during sudden mass delete operations (CASSANDRA-3741)
 + * Open 1 sstableScanner per level for leveled compaction (CASSANDRA-4142)
 + * Optimize reads when row deletion timestamps allow us to restrict
 +   the set of sstables we check (CASSANDRA-4116)
 + * incremental repair by token range (CASSANDRA-3912)
 + * streaming commitlog backup + pitr (CASSANDRA-3690)
 + * avoid generating redundant compaction tasks during streaming
 +   (CASSANDRA-4174)
 + * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to
 +   StorageService mbean (CASSANDRA-556)
 + * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079)
 + * optimize truncate when autosnapshot is disabled (CASSANDRA-4153)
 + * add support for commitlog archiving and point-in-time recovery
 +   (CASSANDRA-3647)
 + * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966)
 + * add column limit to cli (CASSANDRA-3012, 4098)
 + * clean up and optimize DataOutputBuffer, used by CQL compression and
 +   CompositeType (CASSANDRA-4072)
 + * optimize commitlog checksumming (CASSANDRA-3610)
 + * identify and blacklist corrupted SSTables from future compactions 
 +   (CASSANDRA-2261)
 + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037)
 + * Expose repairing by a user provided range (CASSANDRA-3912)
 + * Add way to force the cassandra-cli to refresh it's schema (CASSANDRA-4052)
 + * Avoids having replicate on write tasks stacking up at CL.ONE 
(CASSANDRA-2889)
 + * (cql3) Fix order by for reversed queries (CASSANDRA-4160)
 + * (cql3) Add ReversedType support (CASSANDRA-4004)
 + * (cql3) Add timeuuid type (CASSANDRA-4194)
 + * (cql3) Minor fixes (CASSANDRA-4185)
 + * (cql3) Fix prepared statement in BATCH (CASSANDRA-4202)
 + * (cql3) Reduce the list of reserved keywords (CASSANDRA-4186)
 + * (cql3) Move max/min compaction thresholds to compaction strategy options
 +   (CASSANDRA-4187)
 + * Fix exception during move when localhost is the only source 
(CASSANDRA-4200)
 + * (cql3) Allow paging through non-ordered partitioner results 
(CASSANDRA-3771)
 + * (cql3) Fix drop index (CASSANDRA-4192)
 + * (cql3) Don't return range ghosts anymore (CASSANDRA-3982)
 + * fix the problem re-creating Keyspace/ColumnFamily (CASSANDRA-4219)
 + * fix SecondaryIndex LelevedManifest save upon snapshot (CASSANDRA-4230)
 + * fix missing arrayOffset in FBUtilities.hash (CASSANDRA-4250)
 + * (cql3) Add name of parameters in CqlResultSet (CASSANDRA-4242)
 + * (cql3) Correctly validat order by queries (CASSANDRA-4246)
 +Merged from 1.0:
 + * Fix super columns bug where cache is not updated (CASSANDRA-4190)
 + * fix maxTimestamp to include row tombstones (CASSANDRA-4116)
 + * (CLI) properly handle quotes in create/update keyspace commands 
(CASSANDRA-4129)
 + * Avoids possible deadlock during bootstrap (CASSANDRA-4159)
 + * fix stress tool that hangs forever on timeout or error (CASSANDRA-4128)
 + * Fix super columns bug where cache is not updated (CASSANDRA-4190)
 + * stress tool to return appropriate exit code on failure (CASSANDRA-4188)
 + * fix compaction NPE when out of disk space and assertions disabled
 +   (CASSANDRA-3985)
+  * synchronize LCS getEstimatedTasks to avoid CME (CASSANDRA-4255)
   * ensure unique streaming session id's (CASSANDRA-4223)
  
+ 
 -1.0.10
 - * fix maxTimestamp to include row tombstones (CASSANDRA-4116)
 +1.1.0-final
 + * average a reduced liveRatio estimate with the previous one (CASSANDRA-4065)
 + * Allow KS and CF names up to 48 characters (CASSANDRA-4157)
 + * fix stress build (CASSANDRA-4140)
 + * add time remaining estimate to nodetool compactionstats (CASSANDRA-4167)
 + * (cql) fix NPE in cql3 ALTER TABLE (CASSANDRA-4163)
 + * (cql) Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156)
 + * (cql) Fix type in CQL3 ALTER TABLE preventing update (CASSANDRA-4170)
 + * (cql) Throw invalid exception from CQL3 on obsolete options 
(CASSANDRA-4171)
 + * (cqlsh) fix recognizing uppercase SELECT keyword (CASSANDRA-4161)
 + * Pig: wide row support (CASSANDRA-3909)
 +Merged from 1.0:
   * avoid streaming empty files with bulk loader if sstablewriter errors out
     (CASSANDRA-3946)
 +
 +
 +1.1-rc1
 + * Include stress tool in binary builds (CASSANDRA-4103)
 + * (Hadoop) fix wide row iteration when last row read was deleted
 +   (CASSANDRA-4154)
 + * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114)
 + * Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042)
 + * Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087)
 + * fix KEYS index from skipping results (CASSANDRA-3996)
 + * Remove sliced_buffer_size_in_kb dead option (CASSANDRA-4076)
 + * make loadNewSStable preserve sstable version (CASSANDRA-4077)
 + * Respect 1.0 cache settings as much as possible when upgrading 
 +   (CASSANDRA-4088)
 + * relax path length requirement for sstable files when upgrading on 
 +   non-Windows platforms (CASSANDRA-4110)
 + * fix terminination of the stress.java when errors were encountered
 +   (CASSANDRA-4128)
 + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037)
 + * Fix get_paged_slice (CASSANDRA-4136)
 + * CQL3: Support slice with exclusive start and stop (CASSANDRA-3785)
 +Merged from 1.0:
   * support PropertyFileSnitch in bulk loader (CASSANDRA-4145)
   * add auto_snapshot option allowing disabling snapshot before drop/truncate
     (CASSANDRA-3710)

Reply via email to