]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 442f507 d24cac1)
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)
commit1d59e1eb3f4340101394bbbf70f63025148aef4b
tree5cbeef268c935e650da3b3ee32f1a2735bcaa317tree | snapshot
parent442f50741d7d20531b8d067371fdbafc5354d344commit | diff
parentd24cac1ba4ed158da7bb79b63fbc398d804f1cb2commit | diff
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>
src/ceph_osd.cc diff1 | diff2 | blob | history
src/global/global_init.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.