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 BCDD2181A1 for ; Wed, 14 Oct 2015 18:45:23 +0000 (UTC) Received: (qmail 3419 invoked by uid 500); 14 Oct 2015 18:45:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3377 invoked by uid 500); 14 Oct 2015 18:45:14 -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 3329 invoked by uid 99); 14 Oct 2015 18:45:14 -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; Wed, 14 Oct 2015 18:45:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C536E0BE0; Wed, 14 Oct 2015 18:45:13 +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: Wed, 14 Oct 2015 18:45:16 -0000 Message-Id: <6a97c72c61c94b158c980d559ab9fe43@git.apache.org> In-Reply-To: <0bc48b5e6f224f5191a08eac59a51a0b@git.apache.org> References: <0bc48b5e6f224f5191a08eac59a51a0b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f5e9602 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f5e9602 Branch: refs/heads/trunk Commit: 5f5e9602df803ba34260a62e12faec33a98dd428 Parents: 1415fa5 7875326 Author: Joshua McKenzie Authored: Wed Oct 14 14:44:24 2015 -0400 Committer: Joshua McKenzie Committed: Wed Oct 14 14:44:24 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) ----------------------------------------------------------------------