From commits-return-117365-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Mar 22 15:41:00 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7BBC118076D for ; Thu, 22 Mar 2018 15:40:59 +0100 (CET) Received: (qmail 4955 invoked by uid 500); 22 Mar 2018 14:40:58 -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 4931 invoked by uid 99); 22 Mar 2018 14:40:58 -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, 22 Mar 2018 14:40:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2668DFA44; Thu, 22 Mar 2018 14:40:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dpavlov@apache.org To: commits@ignite.apache.org Date: Thu, 22 Mar 2018 14:40:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ignite git commit: Merge remote-tracking branch 'apache-true/master' Merge remote-tracking branch 'apache-true/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6c982df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6c982df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6c982df Branch: refs/heads/master Commit: d6c982df2843c983e79d9860b4864163817cc47e Parents: caf9bf6 5ccb548 Author: dpavlov Authored: Thu Mar 22 17:41:11 2018 +0300 Committer: dpavlov Committed: Thu Mar 22 17:41:11 2018 +0300 ---------------------------------------------------------------------- .../testframework/junits/GridAbstractTest.java | 7 ++-- .../junits/multijvm/IgniteProcessProxy.java | 43 +++++++++++++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) ----------------------------------------------------------------------