Merge branch 'master' into rm-ooo

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

Wed, 31 Oct 2018 10:32:46 +0000 (11:32 +0100)

committer GitHub <noreply@github.com>

Wed, 31 Oct 2018 10:32:46 +0000 (11:32 +0100)
author Sébastien Han <seb@redhat.com>
Wed, 31 Oct 2018 10:32:46 +0000 (11:32 +0100)
committer GitHub <noreply@github.com>
Wed, 31 Oct 2018 10:32:46 +0000 (11:32 +0100)
diff --cc ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
Simple merge
author	Sébastien Han <seb@redhat.com>
	Wed, 31 Oct 2018 10:32:46 +0000 (11:32 +0100)
committer	GitHub <noreply@github.com>
	Wed, 31 Oct 2018 10:32:46 +0000 (11:32 +0100)