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 8F3ED200C62 for ; Tue, 11 Apr 2017 22:07:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8E11B160B9B; Tue, 11 Apr 2017 20:07:14 +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 D6036160B7D for ; Tue, 11 Apr 2017 22:07:13 +0200 (CEST) Received: (qmail 9036 invoked by uid 500); 11 Apr 2017 20:07:11 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 9027 invoked by uid 99); 11 Apr 2017 20:07:11 -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, 11 Apr 2017 20:07:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 628EADF97E; Tue, 11 Apr 2017 20:07:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbertram@apache.org To: commits@activemq.apache.org Date: Tue, 11 Apr 2017 20:07:12 -0000 Message-Id: <20b97357b755487e850224fdc659f32a@git.apache.org> In-Reply-To: <65a02a9a669a4042a6e25094c42787af@git.apache.org> References: <65a02a9a669a4042a6e25094c42787af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: This closes #1198 archived-at: Tue, 11 Apr 2017 20:07:14 -0000 This closes #1198 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/305d16fd Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/305d16fd Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/305d16fd Branch: refs/heads/master Commit: 305d16fd3af4347b65b740b48bf11668a5c7f19e Parents: f282dff 4e59c17 Author: Justin Bertram Authored: Tue Apr 11 15:06:54 2017 -0500 Committer: Justin Bertram Committed: Tue Apr 11 15:06:54 2017 -0500 ---------------------------------------------------------------------- .../artemis/cli/commands/etc/global-max-specified.txt | 1 - .../artemis/core/deployers/impl/FileConfigurationParser.java | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------