From: Sage Weil <sage@redhat.com>
Date: Fri, 3 Oct 2014 18:58:41 +0000 (-0700)
Subject: Merge pull request #2634 from dachary/wip-9653-ceph-disk-bootstrap-osd-firefly
X-Git-Tag: v0.80.8~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a3bac0c1a7a42cdf7ba846c9ad0a3ae0f15b4bb;p=ceph.git

Merge pull request #2634 from dachary/wip-9653-ceph-disk-bootstrap-osd-firefly

ceph-disk: bootstrap-osd keyring ignores --statedir (firefly)
---

9a3bac0c1a7a42cdf7ba846c9ad0a3ae0f15b4bb