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 E860B18D12 for ; Mon, 29 Jun 2015 17:49:56 +0000 (UTC) Received: (qmail 12385 invoked by uid 500); 29 Jun 2015 17:49:56 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 12350 invoked by uid 500); 29 Jun 2015 17:49:56 -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 12325 invoked by uid 99); 29 Jun 2015 17:49:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 17:49:56 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 29 Jun 2015 17:47:45 +0000 Received: (qmail 11547 invoked by uid 99); 29 Jun 2015 17:49:33 -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; Mon, 29 Jun 2015 17:49:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CF49DE35DA; Mon, 29 Jun 2015 17:49:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 29 Jun 2015 17:49:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/12] incubator-ignite git commit: Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b40d8a5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b40d8a5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b40d8a5e Branch: refs/heads/ignite-1058 Commit: b40d8a5e7d22142ee2e0b1b12507fba7f5607e02 Parents: c86f8f9 01d842a Author: iveselovskiy Authored: Fri Jun 26 13:19:56 2015 +0300 Committer: iveselovskiy Committed: Fri Jun 26 13:19:56 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridDiscoveryEventSelfTest.java | 12 +++++------- scripts/git-patch-prop.sh | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) ----------------------------------------------------------------------