]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5800 from ceph/wip-user
authorSage Weil <sage@redhat.com>
Thu, 10 Sep 2015 22:48:53 +0000 (18:48 -0400)
committerSage Weil <sage@redhat.com>
Thu, 10 Sep 2015 22:48:53 +0000 (18:48 -0400)
ceph-disk: do async startup on upstart; fix dmcrypt create/activate bug

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/ceph-disk

diff --cc src/ceph-disk
Simple merge