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/12/03 21:32:56 UTC
[5/21] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.1' into cassandra-1.2.0
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/08024b3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08024b3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08024b3a
Branch: refs/heads/trunk
Commit: 08024b3ad0ef549c79f0a22925f9d66ced577edb
Parents: d42e3b6 3213574
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 3 14:32:16 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 3 14:32:16 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/08024b3a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 917b958,a0e3eb7..40f6de6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,10 +1,41 @@@
+1.2-beta3
+ * make consistency level configurable in cqlsh (CASSANDRA-4829)
+ * fix cqlsh rendering of blob fields (CASSANDRA-4970)
+ * fix cqlsh DESCRIBE command (CASSANDRA-4913)
+ * save truncation position in system table (CASSANDRA-4906)
+ * Move CompressionMetadata off-heap (CASSANDRA-4937)
+ * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
+ * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
+ * acquire references to overlapping sstables during compaction so bloom filter
+ doesn't get free'd prematurely (CASSANDRA-4934)
+ * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
+ * Separate tracing from Log4J (CASSANDRA-4861)
+ * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
+ * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
+ * Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883)
+ * Change stream session ID to UUID to avoid collision from same node (CASSANDRA-4813)
+ * Use Stats.db when bulk loading if present (CASSANDRA-4957)
+ * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
+ * Remove select arbitrary limit (CASSANDRA-4918)
+ * Correctly handle prepared operation on collections (CASSANDRA-4945)
+ * Fix CQL3 LIMIT (CASSANDRA-4877)
+ * Fix Stress for CQL3 (CASSANDRA-4979)
+ * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
+ * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries (CASSANDRA-4915)
+ * Fix adding column when the table has collections (CASSANDRA-4982)
+ * Fix allowing collections with compact storage (CASSANDRA-4990)
+ * Refuse ttl/writetime function on collections (CASSANDRA-4992)
+ * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
+Merged from 1.1:
++=======
+ 1.1.8
+ * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803)
+ * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
+
+
+ 1.1.7
* cqlsh: improve COPY FROM performance (CASSANDRA-4921)
+ * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803)
* add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
* fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
* reset getRangeSlice filter after finishing a row for get_paged_slice