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/07/07 16:12:50 UTC
[14/50] 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/6b06074e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6b06074e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6b06074e
Branch: refs/heads/master
Commit: 6b06074e94cd32127d86823dbe473f781ba7e3a4
Parents: 6f5da13 db65349
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jun 19 14:49:08 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jun 19 14:49:08 2015 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 42 ++++++++++++--------
pom.xml | 2 +-
2 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------