]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34030 into octopus
authorSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 17:21:52 +0000 (12:21 -0500)
committerSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 17:21:52 +0000 (12:21 -0500)
* refs/pull/34030/head:
cephadm: env over last used
cephadm: fall back to default for infer_image
cephadm: remove outdated check
cephadm: consolidate default image logic
cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>

Trivial merge