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 12A5B118D4 for ; Sun, 11 May 2014 22:20:47 +0000 (UTC) Received: (qmail 29709 invoked by uid 500); 10 May 2014 22:00:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96896 invoked by uid 500); 10 May 2014 21:58:03 -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 59788 invoked by uid 99); 10 May 2014 21:56:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC41F93F36B; Thu, 8 May 2014 16:05:35 +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, 08 May 2014 16:05:37 -0000 Message-Id: In-Reply-To: <0d7af73b3685408abc07752b44af5f25@git.apache.org> References: <0d7af73b3685408abc07752b44af5f25@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/28497fd1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28497fd1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28497fd1 Branch: refs/heads/trunk Commit: 28497fd11b2f60e14ddb4cc7ce9b3e4b7ee44f79 Parents: 6e79342 8dab582 Author: Sylvain Lebresne Authored: Thu May 8 18:05:28 2014 +0200 Committer: Sylvain Lebresne Committed: Thu May 8 18:05:28 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/marshal/AbstractType.java | 3 +-- .../apache/cassandra/serializers/InetAddressSerializer.java | 2 +- .../org/apache/cassandra/serializers/IntegerSerializer.java | 6 +++--- src/java/org/apache/cassandra/serializers/LongSerializer.java | 2 +- .../org/apache/cassandra/serializers/TimestampSerializer.java | 2 +- src/java/org/apache/cassandra/serializers/UUIDSerializer.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28497fd1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28497fd1/src/java/org/apache/cassandra/db/marshal/AbstractType.java ----------------------------------------------------------------------