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 B510A1161C for ; Tue, 8 Jul 2014 22:50:01 +0000 (UTC) Received: (qmail 13702 invoked by uid 500); 8 Jul 2014 22:50:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 13619 invoked by uid 500); 8 Jul 2014 22:50:01 -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 13386 invoked by uid 99); 8 Jul 2014 22:50:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jul 2014 22:50:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9CA0C9A8704; Tue, 8 Jul 2014 22:50:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 08 Jul 2014 22:50:05 -0000 Message-Id: <924ed95e97dd41c1966c96715c7297d6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/cae3cb2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cae3cb2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cae3cb2a Branch: refs/heads/trunk Commit: cae3cb2a95a7e31b9790bad2ea071567a1d707f3 Parents: 004fb64 8571fb5 Author: Jonathan Ellis Authored: Tue Jul 8 17:51:59 2014 -0500 Committer: Jonathan Ellis Committed: Tue Jul 8 17:51:59 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 7 +++++++ 1 file changed, 7 insertions(+) ----------------------------------------------------------------------