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 341FBC160 for ; Thu, 3 May 2012 00:53:27 +0000 (UTC) Received: (qmail 52815 invoked by uid 500); 3 May 2012 00:53:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 52787 invoked by uid 500); 3 May 2012 00:53:27 -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 52778 invoked by uid 99); 3 May 2012 00:53:27 -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, 03 May 2012 00:53:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AD5E313942; Thu, 3 May 2012 00:53:26 +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 X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: merge from 1.1 Message-Id: <20120503005326.AD5E313942@tyr.zones.apache.org> Date: Thu, 3 May 2012 00:53:26 +0000 (UTC) Updated Branches: refs/heads/trunk dfd05673c -> 4279ce466 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4279ce46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4279ce46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4279ce46 Branch: refs/heads/trunk Commit: 4279ce466452959b0329ae2d3048f36d184d6dde Parents: dfd0567 5c3db0d Author: Pavel Yaskevich Authored: Thu May 3 03:53:02 2012 +0300 Committer: Pavel Yaskevich Committed: Thu May 3 03:53:02 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 5 ++ .../src/org/apache/cassandra/stress/Stress.java | 7 ++- .../org/apache/cassandra/stress/StressAction.java | 34 ++++++++++++++- 3 files changed, 42 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4279ce46/CHANGES.txt ----------------------------------------------------------------------