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 2015/04/08 16:32:41 UTC

[2/2] karaf 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/65e79730
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/65e79730
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/65e79730

Branch: refs/heads/master
Commit: 65e79730c7b92f7a66061443ac7cd6d80b94f05f
Parents: ed6a7dd 51f6c2a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 8 16:32:04 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 8 16:32:04 2015 +0200

----------------------------------------------------------------------
 assemblies/features/base/pom.xml                |  1 +
 diagnostic/boot/pom.xml                         |  4 ++
 .../diagnostic/core/internal/Activator.java     | 44 ++++----------
 .../diagnostic/core/internal/DumpHandler.java   | 55 +++++++++++++++++
 .../features/internal/service/Deployer.java     | 25 +++++---
 .../internal/service/FeaturesServiceImpl.java   | 62 +++++++++-----------
 .../org/apache/karaf/main/InstanceHelper.java   |  8 ++-
 .../main/java/org/apache/karaf/main/Main.java   | 10 +++-
 8 files changed, 131 insertions(+), 78 deletions(-)
----------------------------------------------------------------------