Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 745CD18155 for ; Wed, 28 Oct 2015 12:47:09 +0000 (UTC) Received: (qmail 47800 invoked by uid 500); 28 Oct 2015 12:47:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 47720 invoked by uid 500); 28 Oct 2015 12:47:03 -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 46732 invoked by uid 99); 28 Oct 2015 12:47:01 -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; Wed, 28 Oct 2015 12:47:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E5C2E0942; Wed, 28 Oct 2015 12:47:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Wed, 28 Oct 2015 12:47:17 -0000 Message-Id: <4c73b5fc216441459a14e2a9267f076c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-1747 Merge branch 'master' into ignite-1747 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b12663fc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b12663fc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b12663fc Branch: refs/heads/ignite-1537 Commit: b12663fc44b2a0b8d0d867aa2c762e62b0c71250 Parents: 0e48722 15cc1bd Author: Raul Kripalani Authored: Mon Oct 26 13:05:46 2015 +0000 Committer: Raul Kripalani Committed: Mon Oct 26 13:05:46 2015 +0000 ---------------------------------------------------------------------- .../internal/portable/PortableContext.java | 12 +-- .../ignite/internal/util/nio/GridNioServer.java | 2 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 8 +- ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 7 +- .../replicated/GridReplicatedTxPreloadTest.java | 7 +- .../nio/IgniteExceptionInNioWorkerSelfTest.java | 105 +++++++++++++++++++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 4 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 3 + .../CacheHibernateBlobStoreSelfTest.java | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteCacheAbstractBenchmark.java | 63 +++++++++++ .../cache/IgnitePutAllTxBenchmark.java | 6 +- 12 files changed, 220 insertions(+), 14 deletions(-) ----------------------------------------------------------------------