]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #26920 into master
authorSage Weil <sage@redhat.com>
Wed, 13 Mar 2019 13:16:20 +0000 (08:16 -0500)
committerSage Weil <sage@redhat.com>
Wed, 13 Mar 2019 13:16:20 +0000 (08:16 -0500)
* refs/pull/26920/head:
qa/tasks/mgr/test_module_selftest: fix localized value test
mgr/BaseMgrStandbyModule: parse prefix properly

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Trivial merge