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 B92892009EE for ; Wed, 18 May 2016 15:13:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B7BE8160A27; Wed, 18 May 2016 13:13:42 +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 04A97160A1B for ; Wed, 18 May 2016 15:13:41 +0200 (CEST) Received: (qmail 94807 invoked by uid 500); 18 May 2016 13:13:40 -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 94418 invoked by uid 99); 18 May 2016 13:13:40 -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, 18 May 2016 13:13:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8520E009E; Wed, 18 May 2016 13:13:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Wed, 18 May 2016 13:13:51 -0000 Message-Id: <2c8b67bcd8ae4aecb6931a1945d6cca8@git.apache.org> In-Reply-To: <5b4ad6271b12417faac1c59aa333956f@git.apache.org> References: <5b4ad6271b12417faac1c59aa333956f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7 archived-at: Wed, 18 May 2016 13:13:42 -0000 Merge branch 'cassandra-3.0' into cassandra-3.7 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad546832 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad546832 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad546832 Branch: refs/heads/cassandra-3.7 Commit: ad546832ff9856a51f823c0591d6c1fa2b543e18 Parents: 33ddb67 f73b485 Author: T Jake Luciani Authored: Wed May 18 09:12:31 2016 -0400 Committer: T Jake Luciani Committed: Wed May 18 09:12:31 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------