From: Sébastien Han <seb@redhat.com>
Date: Thu, 18 May 2017 09:05:12 +0000 (+0200)
Subject: Merge branch 'stable-2.2' into control-path-bkp
X-Git-Tag: v2.2.6~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae6ed3514c22236d94b9cc02c41df2d25ff8a5cd;p=ceph-ansible.git

Merge branch 'stable-2.2' into control-path-bkp
---

ae6ed3514c22236d94b9cc02c41df2d25ff8a5cd
diff --cc ansible.cfg
index 87f54df0a,8b8868cc6..7b751dce9
--- a/ansible.cfg
+++ b/ansible.cfg
@@@ -9,5 -6,4 +9,5 @@@ roles_path = ./role
  log_path = /var/log/ansible.log
  
  [ssh_connection]
 -control_path = %(directory)s/%%h-%%r # see: https://github.com/ansible/ansible/issues/11536
 +# see: https://github.com/ansible/ansible/issues/11536
- control_path = %(directory)s/%%h-%%r
++control_path = %(directory)s/%%h-%%r