Merge branch 'master' into remove-shrink_mds-from-oldstable

author Guillaume Abrioux <gabrioux@redhat.com>

Wed, 26 Jun 2019 06:15:02 +0000 (08:15 +0200)

committer GitHub <noreply@github.com>

Wed, 26 Jun 2019 06:15:02 +0000 (08:15 +0200)
author Guillaume Abrioux <gabrioux@redhat.com>
Wed, 26 Jun 2019 06:15:02 +0000 (08:15 +0200)
committer GitHub <noreply@github.com>
Wed, 26 Jun 2019 06:15:02 +0000 (08:15 +0200)
diff --cc ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
Simple merge
author	Guillaume Abrioux <gabrioux@redhat.com>
	Wed, 26 Jun 2019 06:15:02 +0000 (08:15 +0200)
committer	GitHub <noreply@github.com>
	Wed, 26 Jun 2019 06:15:02 +0000 (08:15 +0200)