Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/824ffa1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/824ffa1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/824ffa1d Branch: refs/heads/trunk Commit: 824ffa1da02c1daac4772aca6d9df6cfa7d1c7cc Parents: 4f778d2 110a132 Author: Yuki Morishita <[email protected]> Authored: Fri Aug 1 17:21:13 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Aug 1 17:21:13 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/824ffa1d/CHANGES.txt ----------------------------------------------------------------------
