Updated Branches:
refs/heads/cassandra-1.1 cc68c49f4 -> 698a2bbea
Merge branch 'cassandra-1.0' into cassandra-1.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/698a2bbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/698a2bbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/698a2bbe
Branch: refs/heads/cassandra-1.1
Commit: 698a2bbea0fa707c59519bd19741c6b4b61a5cf3
Parents: cc68c49 eb9f961
Author: Sylvain Lebresne <[email protected]>
Authored: Thu Apr 26 16:34:54 2012 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Thu Apr 26 16:34:54 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ColumnFamily.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/698a2bbe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ad2e12e,5b58681..91a8fbe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,6 +1,64 @@@
-1.0.10
+1.1.1-dev
+ * 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)
++Merged from 1.0:
++ * Fix super columns bug where cache is not updated (CASSANDRA-4190)
+
+
+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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/698a2bbe/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------
