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 03B0F108F8 for ; Thu, 13 Mar 2014 21:57:23 +0000 (UTC) Received: (qmail 64815 invoked by uid 500); 13 Mar 2014 21:57:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 64712 invoked by uid 500); 13 Mar 2014 21:57:17 -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 64680 invoked by uid 99); 13 Mar 2014 21:57:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 21:57:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D68159804D3; Thu, 13 Mar 2014 21:57:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xedin@apache.org To: commits@cassandra.apache.org Date: Thu, 13 Mar 2014 21:57:17 -0000 Message-Id: <76492594a85b4b51901f33d324438ba3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/46ed72d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46ed72d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46ed72d7 Branch: refs/heads/trunk Commit: 46ed72d731906e11db785213c57399bbabd34482 Parents: 17af71e 92381fd Author: Pavel Yaskevich Authored: Thu Mar 13 14:57:11 2014 -0700 Committer: Pavel Yaskevich Committed: Thu Mar 13 14:57:11 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/StressAction.java | 10 +++--- .../cassandra/stress/settings/Command.java | 32 ++++++++++++-------- .../stress/settings/SettingsCommand.java | 8 +++-- .../cassandra/stress/settings/SettingsKey.java | 2 +- .../cassandra/stress/settings/SettingsMisc.java | 5 +-- .../cassandra/stress/settings/SettingsRate.java | 2 +- .../stress/settings/StressSettings.java | 2 +- 8 files changed, 38 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ed72d7/CHANGES.txt ----------------------------------------------------------------------