Merge branch 'master' into ceph-ansible-master

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

Tue, 30 Oct 2018 09:22:57 +0000 (10:22 +0100)

committer GitHub <noreply@github.com>

Tue, 30 Oct 2018 09:22:57 +0000 (10:22 +0100)
author Sébastien Han <seb@redhat.com>
Tue, 30 Oct 2018 09:22:57 +0000 (10:22 +0100)
committer GitHub <noreply@github.com>
Tue, 30 Oct 2018 09:22:57 +0000 (10:22 +0100)
diff --cc ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
Simple merge
author	Sébastien Han <seb@redhat.com>
	Tue, 30 Oct 2018 09:22:57 +0000 (10:22 +0100)
committer	GitHub <noreply@github.com>
	Tue, 30 Oct 2018 09:22:57 +0000 (10:22 +0100)