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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a3244d8 88b54ee)

author	Sage Weil <sage@redhat.com>
	Thu, 26 Mar 2020 01:26:27 +0000 (20:26 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 26 Mar 2020 01:26:27 +0000 (20:26 -0500)
commit	3e97b6204be48756f93a547b865259a3622d2b4f
tree	dc08b0269e12e3eca8824a79cd682ca367ea5eea	tree \| snapshot
parent	a3244d8ffc1f1c1cc379807411fc854795a05cbe	commit \| diff
parent	88b54eea36be4315986602792ef4547647ec069f	commit \| diff

Merge PR #34157 into octopus

* refs/pull/34157/head:
Add alertmanager adopt

Reviewed-by: Michael Fritch <mfritch@suse.com>

src/cephadm/cephadm

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