]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1eda1da b94c8de)
Merge PR #41370 into master
authorSage Weil <sage@newdream.net>
Wed, 19 May 2021 11:52:17 +0000 (07:52 -0400)
committerSage Weil <sage@newdream.net>
Wed, 19 May 2021 11:52:17 +0000 (07:52 -0400)
commit825481b4f3b78598955a492fab1e06151ddebc42
tree459cdb9a9e8ef92ae634f419aae17b440722d98etree | snapshot
parent1eda1da113e3f86205d1e6a9dd3d5af989e5fbc5commit | diff
parentb94c8dedd8aa77aeb0b4957e88197ac89370ffb4commit | diff
Merge PR #41370 into master

* refs/pull/41370/head:
mgr/cephadm: pin haproxy image to 2.3.z

Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.