From commits-return-35180-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Sat Nov 24 06:11:29 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 244A3180660 for ; Sat, 24 Nov 2018 06:11:28 +0100 (CET) Received: (qmail 71485 invoked by uid 500); 24 Nov 2018 05:11:28 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 71476 invoked by uid 99); 24 Nov 2018 05:11:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Nov 2018 05:11:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8080B82DC7; Sat, 24 Nov 2018 05:11:27 +0000 (UTC) Date: Sat, 24 Nov 2018 05:11:27 +0000 To: , "' commits@karaf.apache.org" , '@gitbox.apache.org, Subject: [karaf] branch master updated (f96ed16 -> b5a992b) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154303628741.25398.4251982284013167165@gitbox.apache.org> From: jbonofre@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f96ed16c628c8478a41d72721dd7da05c273468f X-Git-Newrev: b5a992bb3f18f8eeabc9600936c8573d1a802ce8 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git. from f96ed16 Merge pull request #658 from jbonofre/KARAF-5789 add cd87359 [KARAF-6020] Fix display of conditional features in features:info command new b5a992b Merge pull request #659 from jbonofre/KARAF-6020 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/karaf/features/command/InfoFeatureCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)