You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2014/08/13 22:20:15 UTC
[6/6] git commit: Merge branch 'karaf-2.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/104ed8a9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/104ed8a9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/104ed8a9
Branch: refs/heads/karaf-2.x
Commit: 104ed8a9b95318ba241d202a4fc4c211f32cac08
Parents: 848f4af f9302db
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:19:57 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:19:57 2014 +0200
----------------------------------------------------------------------
.../src/main/filtered-resources/etc/jre.properties | 6 +++---
pom.xml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------