Merge branch 'master' into guits_rgw_multisite

author Sébastien Han <seb@redhat.com>

Fri, 26 Oct 2018 15:23:03 +0000 (17:23 +0200)

committer GitHub <noreply@github.com>

Fri, 26 Oct 2018 15:23:03 +0000 (17:23 +0200)
author Sébastien Han <seb@redhat.com>
Fri, 26 Oct 2018 15:23:03 +0000 (17:23 +0200)
committer GitHub <noreply@github.com>
Fri, 26 Oct 2018 15:23:03 +0000 (17:23 +0200)
diff --cc ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
Simple merge
author	Sébastien Han <seb@redhat.com>
	Fri, 26 Oct 2018 15:23:03 +0000 (17:23 +0200)
committer	GitHub <noreply@github.com>
	Fri, 26 Oct 2018 15:23:03 +0000 (17:23 +0200)