Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BAFDD200CB7 for ; Thu, 15 Jun 2017 21:09:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B9C83160BC9; Thu, 15 Jun 2017 19:09:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 32B2F160BED for ; Thu, 15 Jun 2017 21:09:36 +0200 (CEST) Received: (qmail 5025 invoked by uid 500); 15 Jun 2017 19:09:35 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 4684 invoked by uid 99); 15 Jun 2017 19:09:35 -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; Thu, 15 Jun 2017 19:09:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E4FB4DFF2D; Thu, 15 Jun 2017 19:09:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mshuler@apache.org To: commits@cassandra.apache.org Date: Thu, 15 Jun 2017 19:09:35 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Thu, 15 Jun 2017 19:09:36 -0000 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13e153b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13e153b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13e153b0 Branch: refs/heads/trunk Commit: 13e153b090cdebd549d0d1a224c231e9fc1abbe1 Parents: f49579d fdb8c96 Author: Michael Shuler Authored: Thu Jun 15 14:06:17 2017 -0500 Committer: Michael Shuler Committed: Thu Jun 15 14:06:17 2017 -0500 ---------------------------------------------------------------------- build.properties.default | 2 +- build.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13e153b0/build.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org