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 2013/12/03 14:57:16 UTC

[4/4] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b34d43f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b34d43f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b34d43f9

Branch: refs/heads/trunk
Commit: b34d43f9747d2ebc1feb516d9675801bcd293d8b
Parents: d12a0d7 1334f94
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 3 14:57:06 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 3 14:57:06 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 .../cassandra/db/marshal/CollectionType.java       | 17 +++++++++++++++++
 .../org/apache/cassandra/db/marshal/ListType.java  |  2 ++
 .../org/apache/cassandra/db/marshal/MapType.java   |  2 ++
 .../org/apache/cassandra/db/marshal/SetType.java   |  2 ++
 5 files changed, 24 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b34d43f9/CHANGES.txt
----------------------------------------------------------------------