Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F283411128 for ; Fri, 1 Aug 2014 22:21:33 +0000 (UTC) Received: (qmail 81591 invoked by uid 500); 1 Aug 2014 22:21:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 81509 invoked by uid 500); 1 Aug 2014 22:21:33 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 81226 invoked by uid 99); 1 Aug 2014 22:21:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 22:21:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D75109BEB32; Fri, 1 Aug 2014 22:21:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Fri, 01 Aug 2014 22:21:37 -0000 Message-Id: <76fcdccc113541b3aa01b9679f00efe9@git.apache.org> In-Reply-To: <6212b1e6243648589f8df8696a170a4a@git.apache.org> References: <6212b1e6243648589f8df8696a170a4a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 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/cassandra-2.1 Commit: 824ffa1da02c1daac4772aca6d9df6cfa7d1c7cc Parents: 4f778d2 110a132 Author: Yuki Morishita Authored: Fri Aug 1 17:21:13 2014 -0500 Committer: Yuki Morishita 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 ----------------------------------------------------------------------