]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #31318 into master
authorSage Weil <sage@redhat.com>
Fri, 1 Nov 2019 18:44:32 +0000 (13:44 -0500)
committerSage Weil <sage@redhat.com>
Fri, 1 Nov 2019 18:44:32 +0000 (13:44 -0500)
* refs/pull/31318/head:
ceph.spec.in: run pathfix.py
ceph-daemon: use /usr/bin/python, not /usr/bin/env python

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/ceph-daemon

diff --cc src/ceph-daemon
Simple merge