From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Nov 2019 21:28:47 +0000 (-0600)
Subject: Merge PR #31838 into master
X-Git-Tag: v15.1.0~725
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa689411d16352556d85c07618c274b5cb8fbb80;p=ceph.git

Merge PR #31838 into master

* 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>
---

fa689411d16352556d85c07618c274b5cb8fbb80