From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 10 Oct 2017 21:33:59 +0000 (-0700)
Subject: Merge PR #18223 into master
X-Git-Tag: v13.0.1~616
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7feb6b28f03638cb0143f68d21878c8aa5a1694c;p=ceph.git

Merge PR #18223 into master

* refs/pull/18223/head:
	githubmap: define merge conflict resolution

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

7feb6b28f03638cb0143f68d21878c8aa5a1694c