]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24102 into master
authorSage Weil <sage@redhat.com>
Wed, 17 Oct 2018 15:07:15 +0000 (10:07 -0500)
committerSage Weil <sage@redhat.com>
Wed, 17 Oct 2018 15:07:15 +0000 (10:07 -0500)
* 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>
1  2 
src/ceph_osd.cc
src/global/global_init.cc
src/osd/OSD.cc

diff --cc src/ceph_osd.cc
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge