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 094E3183F2 for ; Mon, 21 Sep 2015 14:15:55 +0000 (UTC) Received: (qmail 42485 invoked by uid 500); 21 Sep 2015 14:15:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42424 invoked by uid 500); 21 Sep 2015 14:15: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 42336 invoked by uid 99); 21 Sep 2015 14:15: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; Mon, 21 Sep 2015 14:15:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79640E03C0; Mon, 21 Sep 2015 14:15:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 21 Sep 2015 14:15:53 -0000 Message-Id: <3d6864afc4f448c4a60691022eaebb94@git.apache.org> In-Reply-To: <6ea8cd15d91a478fa196c58fd8881e08@git.apache.org> References: <6ea8cd15d91a478fa196c58fd8881e08@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Merge remote-tracking branch 'origin/ignite-1.4' into 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/8b94494a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b94494a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b94494a Branch: refs/heads/master Commit: 8b94494a4817780961c203e0b2b52715baa3b6da Parents: 84a2300 7ccd0b3 Author: Yakov Zhdanov Authored: Fri Sep 18 23:16:10 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Sep 18 23:16:10 2015 +0300 ---------------------------------------------------------------------- .../src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------