]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21985 into wip-sage-testing-20180521.120735
authorSage Weil <sage@redhat.com>
Mon, 21 May 2018 12:07:48 +0000 (07:07 -0500)
committerSage Weil <sage@redhat.com>
Mon, 21 May 2018 12:07:48 +0000 (07:07 -0500)
* refs/pull/21985/head:
common: partially revert 95fc248 to make get_process_name work

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

Trivial merge