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/5b8f91a9 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5b8f91a9 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5b8f91a9 Branch: refs/heads/karaf-3.0.x Commit: 5b8f91a963a41a5335e12130695e53573c2ac2fe Parents: 4b79703 86aff6b Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Dec 12 06:45:51 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Dec 12 06:45:51 2014 +0100 ---------------------------------------------------------------------- .../org/apache/karaf/client/ClientConfig.java | 49 +++++++++++++++++--- 1 file changed, 42 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
