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:14 UTC

[5/6] git commit: Merge branch 'karaf-2.3.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x

Merge branch 'karaf-2.3.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x


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

Branch: refs/heads/karaf-2.3.x
Commit: 743e8cde8a4b431ceaeb4f585ea03cf0b2308e84
Parents: 272acbc ba29f28
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:19:37 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:19:37 2014 +0200

----------------------------------------------------------------------
 .../apache-karaf/src/main/filtered-resources/etc/jre.properties  | 4 ++--
 pom.xml                                                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------