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 31C43185E9 for ; Thu, 9 Jul 2015 03:38:03 +0000 (UTC) Received: (qmail 39334 invoked by uid 500); 9 Jul 2015 03:38:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 39264 invoked by uid 500); 9 Jul 2015 03:38:03 -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 39248 invoked by uid 99); 9 Jul 2015 03:38:03 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2015 03:38:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 89ED61A6C24 for ; Thu, 9 Jul 2015 03:38:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 3TTIZfF94MkA for ; Thu, 9 Jul 2015 03:37:48 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 13CB64C0E4 for ; Thu, 9 Jul 2015 03:37:45 +0000 (UTC) Received: (qmail 37605 invoked by uid 99); 9 Jul 2015 03:37:45 -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, 09 Jul 2015 03:37:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6608EE35C7; Thu, 9 Jul 2015 03:37:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Jul 2015 03:38:04 -0000 Message-Id: <2e6a22ffd7ed4bdeb1bd72f2fb46063e@git.apache.org> In-Reply-To: <779dc7908686478ca6ad726512e027f0@git.apache.org> References: <779dc7908686478ca6ad726512e027f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/50] incubator-ignite git commit: Merge branches 'ignite-591' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591 Merge branches 'ignite-591' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5dc2d2bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dc2d2bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dc2d2bc Branch: refs/heads/ignite-1076 Commit: 5dc2d2bc41bf04d0b7c538dd1a37b3cbc67c45e6 Parents: e54f572 44506c3 Author: Yakov Zhdanov Authored: Tue Jul 7 14:23:41 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jul 7 14:23:41 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 4 +- .../internal/interop/InteropIgnition.java | 31 ++-- .../processors/cache/CacheObjectImpl.java | 1 - .../dht/GridPartitionedGetFuture.java | 13 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 26 +++ .../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++++++++++++ .../GridCachePartitionedNodeRestartTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 - .../GridCacheReplicatedNodeRestartSelfTest.java | 5 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 10 ++ .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 +++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + modules/mesos/pom.xml | 1 - modules/rest-http/pom.xml | 14 +- modules/urideploy/pom.xml | 8 +- modules/web/pom.xml | 6 +- parent/pom.xml | 1 + 20 files changed, 343 insertions(+), 49 deletions(-) ----------------------------------------------------------------------