Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cfd0b515 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cfd0b515 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cfd0b515 Branch: refs/heads/master Commit: cfd0b515bcda170d1c8c0af9de7fbcde74d296bb Parents: 66f3656 5d23a4f Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Mon Nov 23 10:54:15 2015 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Mon Nov 23 10:54:15 2015 +0000 ---------------------------------------------------------------------- osgi/karaf/features/src/main/resources/features.xml | 3 ++- parent/pom.xml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
