From: Sébastien Han <sebastien.han@enovance.com>
Date: Thu, 6 Nov 2014 14:20:33 +0000 (+0100)
Subject: Merge branch 'jjoos-master'
X-Git-Tag: v1.0.0~316
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ef5054394c93afe91b8537bf815a88741b3c330e;p=ceph-ansible.git

Merge branch 'jjoos-master'
---

ef5054394c93afe91b8537bf815a88741b3c330e