You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/08/02 00:21:38 UTC
[7/7] 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/ff4d159e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff4d159e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff4d159e
Branch: refs/heads/trunk
Commit: ff4d159efc64f748200339c728f794916b953e0d
Parents: 37b3a2b 824ffa1
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Aug 1 17:21:19 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Aug 1 17:21:19 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/AbstractCell.java | 2 +-
.../org/apache/cassandra/db/marshal/AbstractType.java | 13 +++++++++++++
.../apache/cassandra/db/marshal/CollectionType.java | 6 ++++++
4 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff4d159e/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff4d159e/src/java/org/apache/cassandra/db/marshal/AbstractType.java
----------------------------------------------------------------------