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 BD95E188E5 for ; Tue, 21 Jul 2015 11:26:20 +0000 (UTC) Received: (qmail 34929 invoked by uid 500); 21 Jul 2015 11:26:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 34892 invoked by uid 500); 21 Jul 2015 11:26:20 -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 34879 invoked by uid 99); 21 Jul 2015 11:26:20 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2015 11:26:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 25CC818A98B for ; Tue, 21 Jul 2015 11:26:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id xn7spCnUkCFT for ; Tue, 21 Jul 2015 11:26:19 +0000 (UTC) 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 DF03A2C6D9 for ; Tue, 21 Jul 2015 11:26:11 +0000 (UTC) Received: (qmail 30595 invoked by uid 99); 21 Jul 2015 11:24:56 -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; Tue, 21 Jul 2015 11:24:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D10E9E3609; Tue, 21 Jul 2015 11:24:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 21 Jul 2015 11:25:22 -0000 Message-Id: In-Reply-To: <3b97ac34b3b142e8b402d0376d8e8068@git.apache.org> References: <3b97ac34b3b142e8b402d0376d8e8068@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/29] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961 Merge remote-tracking branch 'remotes/origin/master' into ignite-961 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e2f26b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e2f26b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e2f26b7 Branch: refs/heads/ignite-961 Commit: 4e2f26b799d099f5ef99a97108f53eeb12e48b96 Parents: 72b91c1 83bba05 Author: ivasilinets Authored: Tue Jul 21 13:52:35 2015 +0300 Committer: ivasilinets Committed: Tue Jul 21 13:52:35 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/IgniteInternalCache.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 16 ++-- .../ignite/internal/util/IgniteUtils.java | 25 ++++-- .../ignite/internal/util/nio/GridNioServer.java | 9 ++ .../util/nio/GridSelectorNioSessionImpl.java | 8 ++ .../IgniteClientReconnectFailoverTest.java | 6 ++ .../cache/CacheAffinityCallSelfTest.java | 10 ++- .../IgniteCachePutRetryAbstractSelfTest.java | 52 +++++++----- ...gniteCachePutRetryTransactionalSelfTest.java | 17 ++-- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../internal/util/nio/GridNioSelfTest.java | 88 ++++++++++++++++++-- .../internal/util/nio/GridNioSslSelfTest.java | 16 ++-- .../testframework/junits/GridAbstractTest.java | 3 +- pom.xml | 12 +-- 16 files changed, 199 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e2f26b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e2f26b7/pom.xml ----------------------------------------------------------------------