From: Sage Weil <sage@redhat.com>
Date: Mon, 21 May 2018 12:07:48 +0000 (-0500)
Subject: Merge PR #21985 into wip-sage-testing-20180521.120735
X-Git-Tag: v14.0.0~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19226d7e18eb715e13aaadb7c5411a9e7af660f5;p=ceph.git

Merge PR #21985 into wip-sage-testing-20180521.120735

* refs/pull/21985/head:
	common: partially revert 95fc248 to make get_process_name work

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

19226d7e18eb715e13aaadb7c5411a9e7af660f5