]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31838 into master
authorSage Weil <sage@redhat.com>
Thu, 28 Nov 2019 21:28:47 +0000 (15:28 -0600)
committerSage Weil <sage@redhat.com>
Thu, 28 Nov 2019 21:28:47 +0000 (15:28 -0600)
* refs/pull/31838/head:
ceph-daemon: chown uid/gid files during `adopt`
ceph-daemon: use 'iglob' instead of 'glob'
ceph-daemon: Fix handling for symlinks on python2

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/ceph-daemon/ceph-daemon

Simple merge