]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2634 from dachary/wip-9653-ceph-disk-bootstrap-osd-firefly
authorSage Weil <sage@redhat.com>
Fri, 3 Oct 2014 18:58:41 +0000 (11:58 -0700)
committerSage Weil <sage@redhat.com>
Fri, 3 Oct 2014 18:58:41 +0000 (11:58 -0700)
ceph-disk: bootstrap-osd keyring ignores --statedir (firefly)


Trivial merge