Updated Branches:
refs/heads/cassandra-1.1 5cda764a9 -> 6b4e5f783
Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql/QueryProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b4e5f78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b4e5f78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b4e5f78
Branch: refs/heads/cassandra-1.1
Commit: 6b4e5f783e18e975e9b8fa9e54a96665a2faa1e3
Parents: 5cda764 edfc06f
Author: Dave Brosius <[email protected]>
Authored: Wed May 30 20:28:04 2012 -0400
Committer: Dave Brosius <[email protected]>
Committed: Wed May 30 20:28:04 2012 -0400
----------------------------------------------------------------------
CHANGES.txt | 3 +
.../org/apache/cassandra/cql/QueryProcessor.java | 39 +++++++++------
2 files changed, 27 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4e5f78/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7ecfa9d,4fd2155..be970a5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -80,44 -3,15 +80,47 @@@ Merged from 1.0
* ensure unique streaming session id's (CASSANDRA-4223)
* kick off background compaction when min/max thresholds change
(CASSANDRA-4279)
+ * improve ability of STCS.getBuckets to deal with 100s of 1000s of
+ sstables, such as when convertinb back from LCS (CASSANDRA-4287)
+ * Oversize integer in CQL throws NumberFormatException (CASSANDRA-4291)
-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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4e5f78/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
