You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/04/05 22:11:55 UTC

[5/17] git commit: Merge from 1.0

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

Branch: refs/heads/cassandra-1.1.0
Commit: 2ca983d9c0b925be8dce90db70c6f64f7712636c
Parents: 2b77ef6 40515ed
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 5 15:09:44 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 5 15:09:44 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt |    1 +
 bin/cqlsh   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca983d9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9a428a5,579b3a5..ceccc71
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,8 +1,46 @@@
 -1.0.10
 - * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
 +1.1-dev
 + * 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)
  
  
 -1.0.9
 +1.1-beta2
 + * rename loaded sstables to avoid conflicts with local snapshots
 +   (CASSANDRA-3967)
 + * start hint replay as soon as FD notifies that the target is back up
 +   (CASSANDRA-3958)
 + * avoid unproductive deserializing of cached rows during compaction
 +   (CASSANDRA-3921)
 + * fix concurrency issues with CQL keyspace creation (CASSANDRA-3903)
 + * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412)
 + * Update ORDER BY syntax for CQL3 (CASSANDRA-3925)
 + * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944)
 + * Fix bug with counters in super columns (CASSANDRA-3821)
 + * Remove deprecated merge_shard_chance (CASSANDRA-3940)
 + * add a convenient way to reset a node's schema (CASSANDRA-2963)
 + * fix for intermittent SchemaDisagreementException (CASSANDRA-3884)
 + * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963)
 + * CLI to report when unsupported column_metadata pair was given (CASSANDRA-3959)
 + * reincarnate removed and deprecated KsDef/CfDef attributes (CASSANDRA-3953)
 + * Fix race between writes and read for cache (CASSANDRA-3862)
 + * perform static initialization of StorageProxy on start-up (CASSANDRA-3797)
 + * support trickling fsync() on writes (CASSANDRA-3950)
 + * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671)
 + * avoid quadratic startup time in LeveledManifest (CASSANDRA-3952)
 + * Add type information to new schema_ columnfamilies and remove thrift
 +   serialization for schema (CASSANDRA-3792)
 + * add missing column validator options to the CLI help (CASSANDRA-3926)
 + * skip reading saved key cache if CF's caching strategy is NONE or ROWS_ONLY (CASSANDRA-3954)
 + * Unify migration code (CASSANDRA-4017)
 +Merged from 1.0:
++ * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
   * improve index sampling performance (CASSANDRA-4023)
   * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
   * delete hints from dropped ColumnFamilies on handoff instead of

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca983d9/bin/cqlsh
----------------------------------------------------------------------