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 0F5E6108D7 for ; Wed, 25 Sep 2013 21:10:02 +0000 (UTC) Received: (qmail 7524 invoked by uid 500); 25 Sep 2013 21:09:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 7367 invoked by uid 500); 25 Sep 2013 21:09:57 -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 7309 invoked by uid 99); 25 Sep 2013 21:09: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; Wed, 25 Sep 2013 21:09:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC9BB90A38B; Wed, 25 Sep 2013 21:09:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Wed, 25 Sep 2013 21:09:59 -0000 Message-Id: <8a7046319c8f400bbd50fbd30fe84e2c@git.apache.org> In-Reply-To: <8e0d5befbb6d44059702b936a8049436@git.apache.org> References: <8e0d5befbb6d44059702b936a8049436@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8845ad60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8845ad60 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8845ad60 Branch: refs/heads/trunk Commit: 8845ad6096ef80ff0dc0f214d7a054eca8514040 Parents: 643dc00 308a3e4 Author: Brandon Williams Authored: Wed Sep 25 16:08:39 2013 -0500 Committer: Brandon Williams Committed: Wed Sep 25 16:08:39 2013 -0500 ---------------------------------------------------------------------- .../hadoop/pig/AbstractCassandraStorage.java | 97 ++++++++------------ 1 file changed, 36 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8845ad60/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java ----------------------------------------------------------------------