Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9012b39d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9012b39d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9012b39d Branch: refs/heads/ignite-1.5 Commit: 9012b39d2f06cd124ff3830167af8b0953df7f64 Parents: 67f4afa d466c7a Author: Yakov Zhdanov <[email protected]> Authored: Thu Dec 10 14:01:41 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Thu Dec 10 14:01:41 2015 +0300 ---------------------------------------------------------------------- modules/osgi-karaf/src/main/resources/features.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
