You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/07/07 06:56:16 UTC
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afe50247
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afe50247
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afe50247
Branch: refs/heads/trunk
Commit: afe502474fb99f9b9e649720dc50d0fe618bcf5c
Parents: 4781e59 9b539f9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Jul 6 23:55:46 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Jul 6 23:55:46 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/cql3/QueryOptions.java | 12 ------------
src/java/org/apache/cassandra/cql3/Tuples.java | 20 ++++++++++++++------
.../org/apache/cassandra/cql3/UserTypes.java | 16 +++++++++++-----
.../cassandra/db/marshal/CollectionType.java | 3 +++
.../serializers/CollectionSerializer.java | 5 +++++
6 files changed, 34 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/afe50247/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 11dc135,9fd3b85..baee9c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+2.1.1
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+
2.1.0
+ * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
* Remove left-over populate_io_cache_on_flush and replicate_on_write
uses (CASSANDRA-7493)
* (Windows) handle spaces in path names (CASSANDRA-7451)