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 D9EAD101FD for ; Thu, 14 Nov 2013 17:49:21 +0000 (UTC) Received: (qmail 36363 invoked by uid 500); 14 Nov 2013 17:49:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36200 invoked by uid 500); 14 Nov 2013 17:49:20 -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 35926 invoked by uid 99); 14 Nov 2013 17:49:19 -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, 14 Nov 2013 17:49:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 39C238A9C42; Thu, 14 Nov 2013 17:49:19 +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, 14 Nov 2013 17:49:23 -0000 Message-Id: <91aa9335ba414e968dd43d7d1e8e7bae@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c41eedf2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c41eedf2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c41eedf2 Branch: refs/heads/trunk Commit: c41eedf22f594f30ad53abaa1dfc84908d4b0ad9 Parents: b92c55e 6fe83cd Author: Sylvain Lebresne Authored: Thu Nov 14 18:49:09 2013 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 14 18:49:09 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 4 ++-- src/java/org/apache/cassandra/cql3/Operation.java | 2 +- src/java/org/apache/cassandra/db/marshal/CompositeType.java | 8 ++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c41eedf2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c41eedf2/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c41eedf2/src/java/org/apache/cassandra/cql3/Operation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c41eedf2/src/java/org/apache/cassandra/db/marshal/CompositeType.java ----------------------------------------------------------------------