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 000CB11360 for ; Sat, 3 May 2014 01:13:14 +0000 (UTC) Received: (qmail 67434 invoked by uid 500); 3 May 2014 01:13:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67337 invoked by uid 500); 3 May 2014 01:13:12 -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 67320 invoked by uid 99); 3 May 2014 01:13:12 -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, 03 May 2014 01:13:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C22B82ABBB; Sat, 3 May 2014 01:13:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sat, 03 May 2014 01:13:13 -0000 Message-Id: <69551517127c4a51ad4bfae3e64c508c@git.apache.org> In-Reply-To: <10fd44e26b604a7f9d09522f511d46bc@git.apache.org> References: <10fd44e26b604a7f9d09522f511d46bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/bc94d385 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc94d385 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc94d385 Branch: refs/heads/trunk Commit: bc94d3859cc028650d75883c35d13d0a1ac4a1e0 Parents: e460e6c bef913a Author: Dave Brosius Authored: Fri May 2 21:12:11 2014 -0400 Committer: Dave Brosius Committed: Fri May 2 21:12:11 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Term.java | 2 +- src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------