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 3D31C178B9 for ; Thu, 18 Jun 2015 08:44:19 +0000 (UTC) Received: (qmail 17355 invoked by uid 500); 18 Jun 2015 08:44:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17325 invoked by uid 500); 18 Jun 2015 08:44:19 -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 17316 invoked by uid 99); 18 Jun 2015 08:44:19 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2015 08:44:19 +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 B77321A5C87 for ; Thu, 18 Jun 2015 08:44:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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-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 P4W_PvhmQ4d6 for ; Thu, 18 Jun 2015 08:44:16 +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 A367A4E5E7 for ; Thu, 18 Jun 2015 08:44:02 +0000 (UTC) Received: (qmail 16165 invoked by uid 99); 18 Jun 2015 08:44: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; Thu, 18 Jun 2015 08:44:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B8A33E002C; Thu, 18 Jun 2015 08:44:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 18 Jun 2015 08:44:41 -0000 Message-Id: <29f9da35d73a40e5a903f2a7f4bd97ad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [42/50] incubator-ignite git commit: Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1 Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eebf9c1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eebf9c1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eebf9c1c Branch: refs/heads/ignite-sprint-7 Commit: eebf9c1c7fa07b442e4a341ffa2b5ce2828032c4 Parents: ed43dfe fffc2ec Author: S.Vladykin Authored: Thu Jun 18 09:43:45 2015 +0300 Committer: S.Vladykin Committed: Thu Jun 18 09:43:45 2015 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionTopologyImpl.java | 4 +++- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 ++++++++++--------- .../junits/common/GridCommonAbstractTest.java | 8 ++++++-- 3 files changed, 19 insertions(+), 12 deletions(-) ----------------------------------------------------------------------