From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jan 2020 22:40:58 +0000 (-0600)
Subject: Merge PR #32616 into master
X-Git-Tag: v15.1.0~76
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ca1fa3643343b4f72c3e1428d5e2638a0ae2df2;p=ceph.git

Merge PR #32616 into master

* refs/pull/32616/head:
	cephadm: annotate call()
	cephadm: podman inspect: image field was called `ImageID`:

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

3ca1fa3643343b4f72c3e1428d5e2638a0ae2df2
diff --cc .githubmap
index 9958f3f7d9a,9958f3f7d9a..0f70169b658
--- a/.githubmap
+++ b/.githubmap
@@@ -112,3 -112,3 +112,4 @@@ jschmid1 Joshua Schmid <jschmid@suse.de
  bk201 Kiefer Chang <kiefer.chang@suse.com>
  alimaredia Ali Maredia <amaredia@redhat.com>
  ideepika Deepika Upadhyay <dupadhya@redhat.com>
++p-se Patrick Seidensal <pseidensal@suse.com>