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 670BE200B92 for ; Tue, 13 Sep 2016 14:45:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 65CD3160AD2; Tue, 13 Sep 2016 12:45:28 +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 AA5AD160AD8 for ; Tue, 13 Sep 2016 14:45:27 +0200 (CEST) Received: (qmail 29800 invoked by uid 500); 13 Sep 2016 12:45:26 -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 29771 invoked by uid 99); 13 Sep 2016 12:45:26 -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; Tue, 13 Sep 2016 12:45:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84094E04D9; Tue, 13 Sep 2016 12:45:26 +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: Tue, 13 Sep 2016 12:45:29 -0000 Message-Id: <99f63df78ed646b298f5d8b430fdb1d1@git.apache.org> In-Reply-To: <05c00f30c2384f77a6f76b1caf05aaf7@git.apache.org> References: <05c00f30c2384f77a6f76b1caf05aaf7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] ignite git commit: Merge branch 'ignite-1.6.7' into ignite-1.6.8 archived-at: Tue, 13 Sep 2016 12:45:28 -0000 Merge branch 'ignite-1.6.7' into ignite-1.6.8 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/499700c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/499700c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/499700c2 Branch: refs/heads/ignite-3887 Commit: 499700c2b48d062b768327f8d35c0349648a1eec Parents: 6c3993d 4ba9c8e Author: vozerov-gridgain Authored: Tue Sep 13 12:38:51 2016 +0300 Committer: vozerov-gridgain Committed: Tue Sep 13 12:38:51 2016 +0300 ---------------------------------------------------------------------- .../cpp/odbc/install/ignite-odbc-install.ini | 1 + .../cpp/odbc/install/install_amd64.cmd | 22 +++++++++++--------- .../platforms/cpp/odbc/install/install_x86.cmd | 11 +++++----- 3 files changed, 19 insertions(+), 15 deletions(-) ----------------------------------------------------------------------