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 5D3392007D1 for ; Thu, 12 May 2016 11:02:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5BFA8160A10; Thu, 12 May 2016 09:02:26 +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 CB123160939 for ; Thu, 12 May 2016 11:02:25 +0200 (CEST) Received: (qmail 27062 invoked by uid 500); 12 May 2016 09:02:25 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 27046 invoked by uid 99); 12 May 2016 09:02:25 -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; Thu, 12 May 2016 09:02:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 933E7DFBDE; Thu, 12 May 2016 09:02:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Date: Thu, 12 May 2016 09:02:25 -0000 Message-Id: In-Reply-To: <0432d9cc65124363bfc5e9881b78edc3@git.apache.org> References: <0432d9cc65124363bfc5e9881b78edc3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.6' into ignite-1.6 archived-at: Thu, 12 May 2016 09:02:26 -0000 Merge remote-tracking branch 'origin/ignite-1.6' into ignite-1.6 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c3ef23c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c3ef23c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c3ef23c Branch: refs/heads/ignite-1.6 Commit: 7c3ef23c2855eba131e26cee329074bef41d2bd1 Parents: e64558e 2d5d124 Author: Anton Vinogradov Authored: Thu May 12 12:00:45 2016 +0300 Committer: Anton Vinogradov Committed: Thu May 12 12:00:45 2016 +0300 ---------------------------------------------------------------------- .../config/benchmark-cache-load-win.properties | 6 +- .../config/benchmark-cache-load.properties | 19 +- .../yardstick/IgniteBenchmarkArguments.java | 21 +- .../IgniteCacheRandomOperationBenchmark.java | 656 +++++++++++-------- .../yardstick/cache/load/model/ModelUtil.java | 4 +- 5 files changed, 392 insertions(+), 314 deletions(-) ----------------------------------------------------------------------