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 17F3217BEC for ; Sun, 23 Aug 2015 10:31:24 +0000 (UTC) Received: (qmail 56867 invoked by uid 500); 23 Aug 2015 10:31:23 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 56768 invoked by uid 500); 23 Aug 2015 10:31:23 -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 56354 invoked by uid 99); 23 Aug 2015 10:31:23 -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; Sun, 23 Aug 2015 10:31:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEAB5E10A2; Sun, 23 Aug 2015 10:31:22 +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: Sun, 23 Aug 2015 10:31:29 -0000 Message-Id: <79d311d56a4b44d1b0d6535573c56ee8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/342e33ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/342e33ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/342e33ff Branch: refs/heads/cassandra-3.0 Commit: 342e33ffb14d10c29d040fa12dbaf48d6f16e410 Parents: 6e48573 a6d6540 Author: Benedict Elliott Smith Authored: Sun Aug 23 11:30:57 2015 +0100 Committer: Benedict Elliott Smith Committed: Sun Aug 23 11:30:57 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/stress/StressProfile.java | 3 +- .../stress/generate/values/BigDecimals.java | 39 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/342e33ff/tools/stress/src/org/apache/cassandra/stress/StressProfile.java ----------------------------------------------------------------------