karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] 01/01: Merge pull request #683 from jbonofre/KARAF-4095
Date Thu, 06 Dec 2018 20:26:38 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 7fa7f9bf0fe64a76cd55f5f8db81003769b04b9e
Merge: 164db88 8c3dda1
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Thu Dec 6 21:26:33 2018 +0100

    Merge pull request #683 from jbonofre/KARAF-4095
    
    [KARAF-4095] Introduce karaf.log env

 .../base/src/main/filtered-resources/resources/bin/client    |  4 ++++
 .../src/main/filtered-resources/resources/bin/client.bat     | 12 +++++++++++-
 .../base/src/main/filtered-resources/resources/bin/inc       | 10 ++++++++++
 .../base/src/main/filtered-resources/resources/bin/instance  |  4 ++++
 .../src/main/filtered-resources/resources/bin/instance.bat   | 12 +++++++++++-
 .../base/src/main/filtered-resources/resources/bin/karaf     |  9 +++++++--
 .../base/src/main/filtered-resources/resources/bin/karaf.bat | 12 ++++++++++++
 .../base/src/main/filtered-resources/resources/bin/shell     |  4 ++++
 .../base/src/main/filtered-resources/resources/bin/shell.bat | 12 +++++++++++-
 .../main/resources/resources/etc/org.ops4j.pax.logging.cfg   |  8 ++++----
 assemblies/features/standard/src/main/feature/feature.xml    |  2 +-
 .../main/resources/karaf.profile/org.ops4j.pax.logging.cfg   |  8 ++++----
 .../resources/karaf.profile/org.ops4j.pax.logging.cfg#static |  8 ++++----
 itests/test/src/test/resources/etc/org.ops4j.pax.logging.cfg |  4 ++--
 .../java/org/apache/karaf/main/util/BootstrapLogManager.java |  2 +-
 .../org/apache/karaf/main/util/BootstrapLogManagerTest.java  |  2 +-
 .../main/asciidoc/developer-guide/custom-distribution.adoc   |  2 +-
 manual/src/main/asciidoc/user-guide/log.adoc                 | 10 +++++-----
 18 files changed, 97 insertions(+), 28 deletions(-)


Mime
View raw message