Merge branch 'KARAF-5413' of https://github.com/paoloantinori/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/62e7179e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/62e7179e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/62e7179e Branch: refs/heads/master Commit: 62e7179e216a01b6ff4a9eb51968a6ef671573f8 Parents: 28415d0 20f3830 Author: Freeman Fang <[email protected]> Authored: Thu Oct 12 15:36:07 2017 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Oct 12 15:36:07 2017 +0800 ---------------------------------------------------------------------- assemblies/features/standard/src/main/feature/feature.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
