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 698D5E643 for ; Fri, 4 Jan 2013 13:44:32 +0000 (UTC) Received: (qmail 26645 invoked by uid 500); 4 Jan 2013 13:44:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 26591 invoked by uid 500); 4 Jan 2013 13:44:32 -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 26370 invoked by uid 99); 4 Jan 2013 13:44:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2013 13:44:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 978BF8226D0; Fri, 4 Jan 2013 13:44:30 +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 X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130104134430.978BF8226D0@tyr.zones.apache.org> Date: Fri, 4 Jan 2013 13:44:30 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 9342dddc5 -> 4993d427b refs/heads/trunk 0fb9da6fc -> 736b2a8e8 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/736b2a8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/736b2a8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/736b2a8e Branch: refs/heads/trunk Commit: 736b2a8e8b30f3d3640e4f4e244937253584e25e Parents: 0fb9da6 4993d42 Author: Brandon Williams Authored: Fri Jan 4 07:44:28 2013 -0600 Committer: Brandon Williams Committed: Fri Jan 4 07:44:28 2013 -0600 ---------------------------------------------------------------------- examples/pig/README.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------