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 CB528200B46 for ; Fri, 1 Jul 2016 14:10:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CA2F7160A6D; Fri, 1 Jul 2016 12:10:46 +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 C7444160A77 for ; Fri, 1 Jul 2016 14:10:45 +0200 (CEST) Received: (qmail 10927 invoked by uid 500); 1 Jul 2016 12:10:45 -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 10474 invoked by uid 99); 1 Jul 2016 12:10:44 -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; Fri, 01 Jul 2016 12:10:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1486ED230; Fri, 1 Jul 2016 12:10:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 01 Jul 2016 12:10:53 -0000 Message-Id: <3a8e324e8cf74a37992f33b322e88e40@git.apache.org> In-Reply-To: <916205a14e4d4e05bf9b06a8a2276d6b@git.apache.org> References: <916205a14e4d4e05bf9b06a8a2276d6b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/27] ignite git commit: Merge branch 'gridgain-7.5.27' into ignite-3184 archived-at: Fri, 01 Jul 2016 12:10:46 -0000 Merge branch 'gridgain-7.5.27' into ignite-3184 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7bbaafcf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7bbaafcf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7bbaafcf Branch: refs/heads/ignite-3185 Commit: 7bbaafcf916bf0dac6fba8c489003c4ca4fecfa0 Parents: 7096957 60a2e28 Author: vozerov-gridgain Authored: Thu Jun 23 13:59:43 2016 +0300 Committer: vozerov-gridgain Committed: Thu Jun 23 13:59:43 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 3 + .../processors/cache/GridCacheAdapter.java | 16 +- .../distributed/near/GridNearGetFuture.java | 8 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../cache/transactions/IgniteTxManager.java | 16 +- .../processors/igfs/IgfsDataManager.java | 14 +- .../processors/igfs/IgfsOutputStreamImpl.java | 10 +- .../internal/processors/igfs/IgfsProcessor.java | 24 -- .../ignite/internal/util/IgniteUtils.java | 45 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../IgniteCacheTxIteratorSelfTest.java | 241 +++++++++++++++++++ .../cluster/GridAddressResolverSelfTest.java | 97 ++++++++ .../igfs/IgfsDataManagerSelfTest.java | 6 +- .../igfs/IgfsProcessorValidationSelfTest.java | 26 -- .../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 ++++++ .../testsuites/IgniteCacheTestSuite5.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + 18 files changed, 501 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7bbaafcf/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ----------------------------------------------------------------------