From: Sage Weil <sage@redhat.com>
Date: Wed, 17 Oct 2018 15:07:15 +0000 (-0500)
Subject: Merge PR #24102 into master
X-Git-Tag: v14.1.0~1168
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d59e1eb3f4340101394bbbf70f63025148aef4b;p=ceph.git

Merge PR #24102 into master

* refs/pull/24102/head:
	global: fix err_to_stderr can't work when it was configured to false
	osd: replace cout/derr with dout(0) to avoid writing trivial logs to syslog file

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

1d59e1eb3f4340101394bbbf70f63025148aef4b