]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32616 into master
authorSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 22:40:58 +0000 (16:40 -0600)
committerSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 22:40:59 +0000 (16:40 -0600)
* 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>
1  2 
.githubmap
src/cephadm/cephadm

diff --cc .githubmap
index 9958f3f7d9a8659e8c0de035b4337e0a6add4199,9958f3f7d9a8659e8c0de035b4337e0a6add4199..0f70169b6585e89925010c32186a3055ed0a513e
@@@ -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>
Simple merge