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 0EEEE110AE for ; Fri, 11 Jul 2014 19:21:26 +0000 (UTC) Received: (qmail 86489 invoked by uid 500); 11 Jul 2014 19:21:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 86398 invoked by uid 500); 11 Jul 2014 19:21:24 -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 86125 invoked by uid 99); 11 Jul 2014 19:21:24 -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, 11 Jul 2014 19:21:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 81DF183CB06; Fri, 11 Jul 2014 19:21:24 +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: Fri, 11 Jul 2014 19:21:28 -0000 Message-Id: <262f82938ab445b08dfe3af47d10b9f9@git.apache.org> In-Reply-To: <68349ef727234208a7fddde714a3ee53@git.apache.org> References: <68349ef727234208a7fddde714a3ee53@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b1e2b9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b1e2b9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b1e2b9c Branch: refs/heads/cassandra-2.1 Commit: 1b1e2b9c06d0644799c2ac9e0b318cadffb6463b Parents: 5207cfa 58931dd Author: Brandon Williams Authored: Fri Jul 11 14:21:08 2014 -0500 Committer: Brandon Williams Committed: Fri Jul 11 14:21:08 2014 -0500 ---------------------------------------------------------------------- examples/hadoop_cql3_word_count/bin/word_count | 0 examples/hadoop_cql3_word_count/bin/word_count_counters | 0 examples/hadoop_cql3_word_count/bin/word_count_setup | 0 3 files changed, 0 insertions(+), 0 deletions(-) ----------------------------------------------------------------------