From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Sep 2019 13:25:44 +0000 (-0500)
Subject: Merge PR #30537 into master
X-Git-Tag: v15.1.0~1441
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba4ef272bb8f9ea0f8b7e22ac68475a936c1586f;p=ceph.git

Merge PR #30537 into master

* refs/pull/30537/head:
	test/pybind: fix local variables for emacs
	crush: add editor property variables

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

ba4ef272bb8f9ea0f8b7e22ac68475a936c1586f