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 1D4D71080C for ; Thu, 20 Feb 2014 20:13:00 +0000 (UTC) Received: (qmail 30177 invoked by uid 500); 20 Feb 2014 20:12:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 30043 invoked by uid 500); 20 Feb 2014 20:12:58 -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 30024 invoked by uid 99); 20 Feb 2014 20:12:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Feb 2014 20:12:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AE92992A51A; Thu, 20 Feb 2014 20:12:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Thu, 20 Feb 2014 20:12:58 -0000 Message-Id: <06c15e52b0d541598d2052bb1eb83bfe@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.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/13b753b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13b753b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13b753b0 Branch: refs/heads/cassandra-2.1 Commit: 13b753b0169aa668c8c6091d68705a4034f7cdd4 Parents: 76e5c93 edf16c9 Author: Sylvain Lebresne Authored: Thu Feb 20 21:11:55 2014 +0100 Committer: Sylvain Lebresne Committed: Thu Feb 20 21:11:55 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/marshal/AbstractCompositeType.java | 2 ++ src/java/org/apache/cassandra/db/marshal/LongType.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b753b0/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java ----------------------------------------------------------------------