You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/10/02 10:12:03 UTC
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e93bcdf4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e93bcdf4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e93bcdf4
Branch: refs/heads/trunk
Commit: e93bcdf45610230a357c3895d4eb6f723d32119f
Parents: d375de2 814e55a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Oct 2 10:11:50 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Oct 2 10:11:50 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Lists.java | 4 +-
.../cassandra/serializers/ListSerializer.java | 7 +
.../cassandra/serializers/MapSerializer.java | 4 +
.../cassandra/serializers/SetSerializer.java | 4 +
.../org/apache/cassandra/cql3/CQLTester.java | 2 +-
.../apache/cassandra/cql3/CollectionsTest.java | 255 +++++++++----------
7 files changed, 142 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/src/java/org/apache/cassandra/cql3/Lists.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/src/java/org/apache/cassandra/serializers/ListSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/src/java/org/apache/cassandra/serializers/MapSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/src/java/org/apache/cassandra/serializers/SetSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------