cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/16] git commit: merge from 1.0
Date Fri, 13 Apr 2012 15:36:05 GMT
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/483a6999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/483a6999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/483a6999

Branch: refs/heads/cassandra-1.1.0
Commit: 483a699928637dcb0e72785a21e5fa16769f9fb0
Parents: 2eaea5b c738813
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Apr 13 10:34:13 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Apr 13 10:35:21 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    8 +-------
 .../cassandra/locator/PropertyFileSnitch.java      |    3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/483a6999/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4ef47c5,26d0011..f09a470
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,20 @@@
 -1.0.10
 +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)
 + * 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)
   * allow short snitch names (CASSANDRA-4130)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/483a6999/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------


Mime
View raw message