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:18:53 UTC
[2/2] git commit: Merge branch 'karaf-3.0.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2797a40a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2797a40a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2797a40a
Branch: refs/heads/karaf-3.0.x
Commit: 2797a40aa3c3d5b023fbb153504ab281435dd175
Parents: 66140ec 16ba191
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:18:36 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:18:36 2014 +0200
----------------------------------------------------------------------
.../resources/etc/jre.properties | 6 ++--
client/pom.xml | 5 ----
.../org/apache/karaf/client/ClientConfig.java | 31 +++++++++++++++++---
.../test-karaf-home/etc/jre.properties | 6 ++--
pom.xml | 4 +--
5 files changed, 35 insertions(+), 17 deletions(-)
----------------------------------------------------------------------