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 2014/06/29 21:19:50 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/19ea9544
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/19ea9544
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/19ea9544

Branch: refs/heads/master
Commit: 19ea9544c4bb2213e778e6c0d22fe114ce2bdc83
Parents: 3279587 fac957c
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Jun 29 21:19:28 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Jun 29 21:19:28 2014 +0200

----------------------------------------------------------------------
 .../core/internal/InstanceServiceImpl.java      | 48 ++++++++++----------
 .../org/apache/karaf/main/InstanceHelper.java   |  2 +-
 .../apache/karaf/util/locks/FileLockUtils.java  | 25 ++++++----
 3 files changed, 41 insertions(+), 34 deletions(-)
----------------------------------------------------------------------