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 26D3F183CF for ; Fri, 12 Jun 2015 22:19:48 +0000 (UTC) Received: (qmail 20067 invoked by uid 500); 12 Jun 2015 22:19:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20008 invoked by uid 500); 12 Jun 2015 22:19:47 -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 19650 invoked by uid 99); 12 Jun 2015 22:19:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 22:19:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7DADE04B0; Fri, 12 Jun 2015 22:19:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Fri, 12 Jun 2015 22:19:49 -0000 Message-Id: <8032f94a744945ecb9822670006e7fba@git.apache.org> In-Reply-To: <1f8173c48b3b46f1ba6b4aa9e5cbebe6@git.apache.org> References: <1f8173c48b3b46f1ba6b4aa9e5cbebe6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk Merge branch 'cassandra-2.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/7476d83b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7476d83b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7476d83b Branch: refs/heads/trunk Commit: 7476d83b44fa58a354fc0c7330b74b8e7ed7a3a3 Parents: 40c3e89 2e92cf8 Author: Josh McKenzie Authored: Fri Jun 12 18:19:06 2015 -0400 Committer: Josh McKenzie Committed: Fri Jun 12 18:19:06 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------