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 F2FED175EA for ; Mon, 2 Mar 2015 15:13:03 +0000 (UTC) Received: (qmail 34554 invoked by uid 500); 2 Mar 2015 15:12:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 34460 invoked by uid 500); 2 Mar 2015 15:12:50 -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 34375 invoked by uid 99); 2 Mar 2015 15:12:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 15:12:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_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, 02 Mar 2015 15:12:49 +0000 Received: (qmail 28344 invoked by uid 99); 2 Mar 2015 15:12:24 -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, 02 Mar 2015 15:12:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41232E0EE5; Mon, 2 Mar 2015 15:12:24 +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, 02 Mar 2015 15:13:10 -0000 Message-Id: <24cf9bc21a2f4c32a292d9a2205b1ed3@git.apache.org> In-Reply-To: <8a38d58f7edd4d9ea753062a662f5c82@git.apache.org> References: <8a38d58f7edd4d9ea753062a662f5c82@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] incubator-ignite git commit: Merge branch 'ignite-382' into sprint-2 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-382' into sprint-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b309f25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b309f25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b309f25 Branch: refs/heads/ignite-334 Commit: 3b309f250e872fff4ea290fb2b8acb7388fadfb2 Parents: 028e446 f252ee4 Author: anovikov Authored: Mon Mar 2 21:48:07 2015 +0700 Committer: anovikov Committed: Mon Mar 2 21:48:07 2015 +0700 ---------------------------------------------------------------------- examples/pom-standalone.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------