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 25237200AE4 for ; Wed, 11 May 2016 04:52:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 240A3160A12; Wed, 11 May 2016 02:52: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 53D8A16098A for ; Wed, 11 May 2016 04:52:32 +0200 (CEST) Received: (qmail 1942 invoked by uid 500); 11 May 2016 02:52:31 -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 1836 invoked by uid 99); 11 May 2016 02:52:31 -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; Wed, 11 May 2016 02:52:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 61D11DFFF8; Wed, 11 May 2016 02:52:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Wed, 11 May 2016 02:52:34 -0000 Message-Id: <15123d14d7cb4bce8fe14ed0c04807ff@git.apache.org> In-Reply-To: <5ff6c2cae5e741958ac5e19e2a4bdac1@git.apache.org> References: <5ff6c2cae5e741958ac5e19e2a4bdac1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] ignite git commit: Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite archived-at: Wed, 11 May 2016 02:52:33 -0000 Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7755c80c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7755c80c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7755c80c Branch: refs/heads/master Commit: 7755c80ca8d3964cb3c40a30802bb7817a4e7e71 Parents: 3bd5839 949f0a4 Author: Alexey Kuznetsov Authored: Wed May 11 09:52:19 2016 +0700 Committer: Alexey Kuznetsov Committed: Wed May 11 09:52:19 2016 +0700 ---------------------------------------------------------------------- .../cpp/odbc/src/config/configuration.cpp | 2 +- modules/platforms/dotnet/Apache.Ignite.sln | 16 ++++---- .../commands/alert/VisorAlertCommand.scala | 43 +++++++++----------- 3 files changed, 30 insertions(+), 31 deletions(-) ----------------------------------------------------------------------