[2/2] karaf git commit: Merge branch 'feature-doc-work' of https://github.com/bimargulies/karaf

[jbonofre]

Merge branch 'feature-doc-work' of https://github.com/bimargulies/karaf


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

Branch: refs/heads/master
Commit: 4e95614c6e50ba776265658af54d550cc75f46ce
Parents: a8c8a7e f02f4d4
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Wed Sep 2 10:59:39 2015 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Wed Sep 2 10:59:39 2015 +0200

----------------------------------------------------------------------
 .../features/GenerateDescriptorMojo.java        | 33 +++++++++++++++-----
 .../apache/karaf/tooling/utils/MojoSupport.java |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------