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

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

ceph-disk: bootstrap-osd keyring ignores --statedir

Reviewed-by: Sage Weil <sage@redhat.com>
---

67d90318203e40a71c2e83d6dd72588963e49db6