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 83141112F4 for ; Sat, 20 Sep 2014 07:44:58 +0000 (UTC) Received: (qmail 51882 invoked by uid 500); 20 Sep 2014 07:44:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 51851 invoked by uid 500); 20 Sep 2014 07:44:58 -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 51821 invoked by uid 99); 20 Sep 2014 07:44:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Sep 2014 07:44:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C51F5A20553; Sat, 20 Sep 2014 07:44:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Sat, 20 Sep 2014 07:44:59 -0000 Message-Id: <8b6e093f9c1c4fd69909f2ad0150c907@git.apache.org> In-Reply-To: <60cf94b8c4e64c40aac47667d0fe0586@git.apache.org> References: <60cf94b8c4e64c40aac47667d0fe0586@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/77625187 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77625187 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77625187 Branch: refs/heads/trunk Commit: 77625187458beaadd8f964f8efba72292c012244 Parents: cfb7ace eecc034 Author: Benedict Elliott Smith Authored: Sat Sep 20 08:44:43 2014 +0100 Committer: Benedict Elliott Smith Committed: Sat Sep 20 08:44:43 2014 +0100 ---------------------------------------------------------------------- .../apache/cassandra/stress/StressAction.java | 34 +++++++++++--------- .../cassandra/stress/settings/SettingsRate.java | 24 +++++++------- 2 files changed, 31 insertions(+), 27 deletions(-) ----------------------------------------------------------------------