From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 15 Oct 2018 21:34:21 +0000 (-0700)
Subject: Merge PR #24562 into master
X-Git-Tag: v14.0.1~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28b9b4ea2b4926fccd5282ebafaec14dc1c5f306;p=ceph.git

Merge PR #24562 into master

* refs/pull/24562/head:
	removed warning for resolved errata

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

28b9b4ea2b4926fccd5282ebafaec14dc1c5f306
diff --cc .githubmap
index c85f8efde2a6,c85f8efde2a6..fc0f6a7dba03
--- a/.githubmap
+++ b/.githubmap
@@@ -14,7 -14,7 +14,6 @@@ amitkumar50 Amit Kumar <amitkuma@redhat
  athanatos Samuel Just <sjust@redhat.com>
  badone Brad Hubbard <bhubbard@redhat.com>
  bassamtabbara Bassam Tabbara <bassam.tabbara@quantum.com>
--batrick Patrick Donnelly <pdonnell@redhat.com>
  branch-predictor Piotr Dałek <piotr.dalek@corp.ovh.com>
  callithea Laura Paduano <lpaduano@suse.com>
  capri1989 Kai Wagner <kwagner@suse.com>
@@@ -83,3 -83,3 +82,4 @@@ vshankar Venky Shankar <vshankar@redhat
  adamemerson Adam C. Emerson <aemerson@redhat.com>
  myoungwon Myoungwon Oh <omwmw@sk.com>
  dillaman Jason Dillaman <dillaman@redhat.com>
++batrick Patrick Donnelly <pdonnell@redhat.com>