From: Sage Weil <sage@redhat.com>
Date: Mon, 15 Oct 2018 23:41:53 +0000 (-0500)
Subject: Merge PR #24596 into master
X-Git-Tag: v14.0.1~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=585d21df6550edfb69245474578fad4e7649b934;p=ceph.git

Merge PR #24596 into master

* refs/pull/24596/head:
	ptl-tool.py: move githubmap update into merge commit

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

585d21df6550edfb69245474578fad4e7649b934