From: Matthew Rees <matthew.rees@secate.com>
Date: Thu, 13 Nov 2014 12:59:23 +0000 (+0200)
Subject: Merge pull request #6 from ceph/master
X-Git-Tag: v1.0.0~299^2~3^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8406d44432fc60c17be972b6cb9322e68e5d2b74;p=ceph-ansible.git

Merge pull request #6 from ceph/master

Rebase from upstream
---

8406d44432fc60c17be972b6cb9322e68e5d2b74