You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/08/03 09:29:34 UTC
[karaf] branch master updated (51139fb -> 77d11a6)
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 51139fb Merge pull request #584 from jbonofre/KARAF-5856
add efa4ffd [KARAF-5798] use a consistent way to get the Karaf process ID; write the pid file when the process launches so that it contains an accurate value for either a master or slave instance; only update the instance PID for the current running master (i.e. once lock is acquired)
new 77d11a6 Merge pull request #542 from mzipay/KARAF-5798
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:
.../java/org/apache/karaf/main/InstanceHelper.java | 35 ++++---
main/src/main/java/org/apache/karaf/main/Main.java | 5 +-
.../org/apache/karaf/main/MainLockingTest.java | 101 +++++++++++++++++++--
.../test/java/org/apache/karaf/main/MockLock.java | 2 +
4 files changed, 114 insertions(+), 29 deletions(-)
[karaf] 01/01: Merge pull request #542 from mzipay/KARAF-5798
Posted by jb...@apache.org.
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 77d11a601be54b2627fa86819256f5295c01e1ae
Merge: 51139fb efa4ffd
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Aug 3 11:29:32 2018 +0200
Merge pull request #542 from mzipay/KARAF-5798
[KARAF-5798] use a consistent way to get the Karaf process ID; write …
.../java/org/apache/karaf/main/InstanceHelper.java | 35 ++++---
main/src/main/java/org/apache/karaf/main/Main.java | 5 +-
.../org/apache/karaf/main/MainLockingTest.java | 101 +++++++++++++++++++--
.../test/java/org/apache/karaf/main/MockLock.java | 2 +
4 files changed, 114 insertions(+), 29 deletions(-)