]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fc600c 60ddc4d)
Merge PR #31445 into master
authorSage Weil <sage@redhat.com>
Thu, 7 Nov 2019 15:41:19 +0000 (09:41 -0600)
committerSage Weil <sage@redhat.com>
Thu, 7 Nov 2019 15:41:19 +0000 (09:41 -0600)
* refs/pull/31445/head:
ceph-daemon: set container_image during bootstrap

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/ceph-daemon patch | diff1 | diff2 | blob | history

diff --cc src/ceph-daemon
Simple merge
Unnamed repository; edit this file 'description' to name the repository.