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

[6/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/27a86f3f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/27a86f3f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/27a86f3f

Branch: refs/heads/master
Commit: 27a86f3f45bcfdadce0cc8fbbb193506b2f3b07c
Parents: b02ec41 4a53ed8
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Aug 14 21:42:23 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Aug 14 21:42:23 2014 +0200

----------------------------------------------------------------------
 manual/src/main/webapp/users-guide/provisioning.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------