]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8f8074 ef846c5)
Merge PR #33438 into master
authorSage Weil <sage@redhat.com>
Sat, 29 Feb 2020 03:32:47 +0000 (21:32 -0600)
committerSage Weil <sage@redhat.com>
Sat, 29 Feb 2020 03:32:47 +0000 (21:32 -0600)
* refs/pull/33438/head:
cephadm: add prometheus adopt

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

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