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 4A08F17C9C for ; Wed, 22 Apr 2015 22:19:50 +0000 (UTC) Received: (qmail 31166 invoked by uid 500); 22 Apr 2015 22:19:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31138 invoked by uid 500); 22 Apr 2015 22:19:50 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 31092 invoked by uid 99); 22 Apr 2015 22:19:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 22:19:50 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 22:19:45 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 728C725BBC for ; Wed, 22 Apr 2015 22:19:25 +0000 (UTC) Received: (qmail 30944 invoked by uid 99); 22 Apr 2015 22:19: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; Wed, 22 Apr 2015 22:19:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C855E03E4; Wed, 22 Apr 2015 22:19:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 22 Apr 2015 22:19:31 -0000 Message-Id: <6e44dc7d3a8d411eae5f50d0da789554@git.apache.org> In-Reply-To: <8b772380117c4298ac3a08535d1e2d5f@git.apache.org> References: <8b772380117c4298ac3a08535d1e2d5f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1556ec98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1556ec98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1556ec98 Branch: refs/heads/ignite-757 Commit: 1556ec98d937676455964948d5726ec1e871a320 Parents: 00f532c 8e31b7c Author: S.Vladykin Authored: Thu Apr 23 01:13:48 2015 +0300 Committer: S.Vladykin Committed: Thu Apr 23 01:13:48 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 107 +++++++++++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../discovery/GridDiscoveryManager.java | 18 +++- .../IgniteCacheObjectProcessorImpl.java | 2 +- ...acheSortedEvictionPolicyPerformanceTest.java | 13 ++- pom.xml | 14 +-- 7 files changed, 143 insertions(+), 28 deletions(-) ----------------------------------------------------------------------