Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c47f4070 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c47f4070 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c47f4070 Branch: refs/heads/trunk Commit: c47f4070dc7da4074f1277cfc387dcc21335b45d Parents: 86c3afb 9f268d1 Author: Sylvain Lebresne <[email protected]> Authored: Thu Mar 21 13:58:00 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Mar 21 13:58:00 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Lists.java | 19 +++++++- src/java/org/apache/cassandra/cql3/Maps.java | 35 +++++++++++++-- src/java/org/apache/cassandra/cql3/Sets.java | 10 ++++- .../cassandra/db/marshal/CollectionType.java | 6 +++ .../org/apache/cassandra/db/marshal/ListType.java | 4 +- .../org/apache/cassandra/db/marshal/MapType.java | 6 +- .../org/apache/cassandra/db/marshal/SetType.java | 4 +- 8 files changed, 71 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47f4070/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f04be52,6827087..3edf335 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,9 -4,9 +24,10 @@@ * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) * Improve asynchronous hint delivery (CASSANDRA-5179) * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355) + 1.2.3 * add check for sstable overlap within a level on startup (CASSANDRA-5327) * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47f4070/src/java/org/apache/cassandra/cql3/Lists.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47f4070/src/java/org/apache/cassandra/db/marshal/CollectionType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47f4070/src/java/org/apache/cassandra/db/marshal/ListType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47f4070/src/java/org/apache/cassandra/db/marshal/MapType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c47f4070/src/java/org/apache/cassandra/db/marshal/SetType.java ----------------------------------------------------------------------
