You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@karaf.apache.org by jb...@apache.org on 2014/08/14 21:50:37 UTC

[2/7] git commit: Merge branch 'master' into SYNCOPE_LM

Merge branch 'master' into SYNCOPE_LM


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

Branch: refs/heads/master
Commit: 972a14d30b3ea6520c2b0cbc627c32f4d1eeaf94
Parents: eb82177 9e42abd
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Aug 13 08:17:17 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Aug 13 08:17:17 2014 +0200

----------------------------------------------------------------------
 client/pom.xml                                  |  5 ----
 .../org/apache/karaf/client/ClientConfig.java   | 31 +++++++++++++++++---
 2 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------