cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Mon, 07 Jul 2014 16:06:40 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.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/59a8504c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59a8504c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59a8504c

Branch: refs/heads/trunk
Commit: 59a8504c34b361e88ed10964c150272edcc91ff5
Parents: 0b54c4e 8d87e0e
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Jul 7 18:06:04 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Jul 7 18:06:04 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   4 +-
 .../org/apache/cassandra/cql3/Constants.java    |   8 +-
 .../org/apache/cassandra/cql3/UserTypes.java    |  11 ++
 .../cassandra/cql3/VariableSpecifications.java  |   6 ++
 .../cql3/statements/SelectStatement.java        |   1 +
 .../org/apache/cassandra/transport/Message.java |  51 +++++----
 .../org/apache/cassandra/cql3/CQLTester.java    |  82 ++++++++++++--
 .../cassandra/cql3/ContainsRelationTest.java    | 106 +++++++++++--------
 .../apache/cassandra/cql3/UserTypesTest.java    |  33 ++++++
 9 files changed, 227 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a8504c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b93005e,491ad6d..682f599
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,4 +1,10 @@@
 +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
+ 2.1.0-rc3
   * Fix ClassCastException processing expired messages (CASSANDRA-7496)
   * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
   * Remove left-over populate_io_cache_on_flush and replicate_on_write


Mime
View raw message