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 AEB4B188AA for ; Mon, 6 Jul 2015 07:45:41 +0000 (UTC) Received: (qmail 5057 invoked by uid 500); 6 Jul 2015 07:45:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 5025 invoked by uid 500); 6 Jul 2015 07:45:41 -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 5016 invoked by uid 99); 6 Jul 2015 07:45:41 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jul 2015 07:45:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 37BF1D2723 for ; Mon, 6 Jul 2015 07:45:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.138 X-Spam-Level: * X-Spam-Status: No, score=1.138 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.663, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7f51AeEF8y4N for ; Mon, 6 Jul 2015 07:45:29 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 583C3249C8 for ; Mon, 6 Jul 2015 07:45:27 +0000 (UTC) Received: (qmail 4885 invoked by uid 99); 6 Jul 2015 07:45:27 -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, 06 Jul 2015 07:45:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBF43E0061; Mon, 6 Jul 2015 07:45:26 +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, 06 Jul 2015 07:45:29 -0000 Message-Id: <9ab960f4d07b4bb68c3dd8d05b9f2f91@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/15] incubator-ignite git commit: Merge branch 'ignite-1055' into ignite-sprint-7 Merge branch 'ignite-1055' into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f6a7f9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f6a7f9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f6a7f9b Branch: refs/heads/ignite-747 Commit: 9f6a7f9bed05bd15807c534eb14d801bedd37970 Parents: 7828d19 251f0c8 Author: ashutak Authored: Fri Jul 3 17:52:00 2015 +0300 Committer: ashutak Committed: Fri Jul 3 17:52:00 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 8 ++++++-- bin/ignite.sh | 6 +++++- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 +++ .../apache/ignite/startup/cmdline/CommandLineStartup.java | 3 ++- .../ignite/startup/cmdline/CommandLineTransformer.java | 9 +++++++++ 6 files changed, 26 insertions(+), 4 deletions(-) ----------------------------------------------------------------------