From: Sébastien Han <sebastien.han@enovance.com>
Date: Wed, 29 Apr 2015 09:15:14 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/ceph/ceph-ansible
X-Git-Tag: v1.0.0~220^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bae8faf30de0b5153283a29ab82907bfc3170549;p=ceph-ansible.git

Merge branch 'master' of https://github.com/ceph/ceph-ansible

Conflicts:
	rolling_update.yml
---

bae8faf30de0b5153283a29ab82907bfc3170549