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 9189E176D3 for ; Thu, 1 Oct 2015 13:58:54 +0000 (UTC) Received: (qmail 51892 invoked by uid 500); 1 Oct 2015 13:58:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51807 invoked by uid 500); 1 Oct 2015 13:58:48 -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 51594 invoked by uid 99); 1 Oct 2015 13:58:48 -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, 01 Oct 2015 13:58:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD2ABE154E; Thu, 1 Oct 2015 13:58:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 01 Oct 2015 13:59:02 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/17] ignite git commit: Merge branch 'ignite-1.4' Merge branch 'ignite-1.4' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd091c82 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd091c82 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd091c82 Branch: refs/heads/ignite-1534-1 Commit: fd091c82892040df8da935527ce72da996fa7718 Parents: 0309f96 7752aa9 Author: Anton Vinogradov Authored: Thu Oct 1 16:26:28 2015 +0300 Committer: Anton Vinogradov Committed: Thu Oct 1 16:26:28 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 + assembly/dependencies-fabric.xml | 2 +- assembly/release-fabric.xml | 10 ++- examples/schema-import/pom-standalone.xml | 90 ++++++++++++++++++++ examples/schema-import/pom.xml | 13 ++- .../discovery/GridDiscoveryManager.java | 2 +- pom.xml | 9 +- 7 files changed, 119 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/examples/schema-import/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/pom.xml ----------------------------------------------------------------------