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 CD85C200CD9 for ; Wed, 19 Jul 2017 20:04:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CC15516986F; Wed, 19 Jul 2017 18:04: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 AEDFF169886 for ; Wed, 19 Jul 2017 20:04:27 +0200 (CEST) Received: (qmail 94035 invoked by uid 500); 19 Jul 2017 18:04:24 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 91999 invoked by uid 99); 19 Jul 2017 18:04:22 -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, 19 Jul 2017 18:04:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F3A34E93E8; Wed, 19 Jul 2017 18:04:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ladyvader@apache.org To: commits@geode.apache.org Date: Wed, 19 Jul 2017 18:05:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [42/51] [abbrv] geode git commit: Merge branch 'feature/GEODE-2601' into develop archived-at: Wed, 19 Jul 2017 18:04:28 -0000 Merge branch 'feature/GEODE-2601' into develop This closes #606 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/47c85784 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/47c85784 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/47c85784 Branch: refs/heads/feature/GEODE-3113 Commit: 47c857848a29370205158d6efef13bce8c0c63f4 Parents: 9e7696a 3f9be9a Author: Ken Howe Authored: Tue Jul 18 07:13:32 2017 -0700 Committer: Ken Howe Committed: Tue Jul 18 07:13:32 2017 -0700 ---------------------------------------------------------------------- .../cli/commands/GfshStartLocatorLogTest.java | 61 ++++++++++++++++++++ .../distributed/internal/InternalLocator.java | 6 -- .../apache/geode/internal/AbstractConfig.java | 18 +++--- .../java/org/apache/geode/internal/Banner.java | 8 +-- .../geode/internal/i18n/LocalizedStrings.java | 2 +- .../internal/logging/LogWriterFactory.java | 2 +- .../logging/log4j/LogWriterAppenders.java | 8 +-- .../internal/logging/TestLogWriterFactory.java | 4 +- .../geode/test/dunit/SerializableCallable.java | 2 +- 9 files changed, 85 insertions(+), 26 deletions(-) ----------------------------------------------------------------------