[karaf-decanter] branch master updated (c03a9e5 -> 4122340)

[fp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git.


    from c03a9e5  Merge pull request #49 from fpapon/KARAF-5888
     add 5c09899  [KARAF-5864] Add triming on the system collector command output
     new 4122340  Merge pull request #51 from jbonofre/KARAF-5864

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:
 .../system/src/main/cfg/org.apache.karaf.decanter.collector.system.cfg | 2 ++
 .../org/apache/karaf/decanter/collector/system/SystemCollector.java    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

[karaf-decanter] 01/01: Merge pull request #51 from jbonofre/KARAF-5864

[fp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git

commit 4122340f6c4e31478593906562811fd04ca0312e
Merge: c03a9e5 5c09899
Author: François Papon <fr...@openobject.fr>
AuthorDate: Fri Sep 7 12:10:23 2018 +0400

    Merge pull request #51 from jbonofre/KARAF-5864
    
    [KARAF-5864] Add triming on the system collector command output

 .../system/src/main/cfg/org.apache.karaf.decanter.collector.system.cfg | 2 ++
 .../org/apache/karaf/decanter/collector/system/SystemCollector.java    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)