Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 02D42200B82 for ; Fri, 16 Sep 2016 12:43:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F411D160AD9; Fri, 16 Sep 2016 10:43:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6ABBA160A8C for ; Fri, 16 Sep 2016 12:43:33 +0200 (CEST) Received: (qmail 51761 invoked by uid 500); 16 Sep 2016 10:43:32 -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 51747 invoked by uid 99); 16 Sep 2016 10:43:32 -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; Fri, 16 Sep 2016 10:43:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 698FBDFA0C; Fri, 16 Sep 2016 10:43:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ptupitsyn@apache.org To: commits@ignite.apache.org Date: Fri, 16 Sep 2016 10:43:33 -0000 Message-Id: In-Reply-To: <38edba46059e4fb797b3bc118ec894e8@git.apache.org> References: <38edba46059e4fb797b3bc118ec894e8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-1.7.2' into UPSTREAM_master archived-at: Fri, 16 Sep 2016 10:43:34 -0000 Merge remote-tracking branch 'remotes/community/ignite-1.7.2' into UPSTREAM_master # Conflicts: # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/730f2c3c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/730f2c3c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/730f2c3c Branch: refs/heads/master Commit: 730f2c3cb7c66cc185642fbadd8485ac02bf93ed Parents: e7ae5c8 886ed64 Author: Pavel Tupitsyn Authored: Fri Sep 16 13:42:19 2016 +0300 Committer: Pavel Tupitsyn Committed: Fri Sep 16 13:42:19 2016 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/730f2c3c/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs ----------------------------------------------------------------------