]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 992499c 55541d3)
Merge PR #31458 into master
authorSage Weil <sage@redhat.com>
Thu, 7 Nov 2019 13:55:14 +0000 (07:55 -0600)
committerSage Weil <sage@redhat.com>
Thu, 7 Nov 2019 13:55:14 +0000 (07:55 -0600)
* refs/pull/31458/head:
ceph-daemon: Only run in the __main__ scope

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/ceph-daemon patch | diff1 | diff2 | blob | history

diff --cc src/ceph-daemon
Simple merge
Unnamed repository; edit this file 'description' to name the repository.