git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d8f8074 ef846c5)

author	Sage Weil <sage@redhat.com>
	Sat, 29 Feb 2020 03:32:47 +0000 (21:32 -0600)
committer	Sage Weil <sage@redhat.com>
	Sat, 29 Feb 2020 03:32:47 +0000 (21:32 -0600)
commit	45555c529d96aaed2dad716695a7ccaa9eb51ff0
tree	42013ed3beaeb8da4f4b622cbf1ad877c8030d9c	tree \| snapshot
parent	d8f80745349d306223083cc7bc116aea56cb91af	commit \| diff
parent	ef846c5d2917fea53aeb3ab972fa23cb192468f6	commit \| diff

Merge PR #33438 into master

* refs/pull/33438/head:
cephadm: add prometheus adopt

Reviewed-by: Sage Weil <sage@redhat.com>

src/cephadm/cephadm

Unnamed repository; edit this file 'description' to name the repository.