]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #21315 into wip-sage-testing-20180410.153007
authorSage Weil <sage@redhat.com>
Tue, 10 Apr 2018 15:30:48 +0000 (10:30 -0500)
committerSage Weil <sage@redhat.com>
Tue, 10 Apr 2018 15:30:48 +0000 (10:30 -0500)
commitdbdbbbfc89a7e0467d7bd8fd272f3c812ab31eda
treef5029e965e31af35e1c0c723398c328f8fdc7d2a
parentd84f723c57dd8ac61be3951b9579365cb6cbfbcf
parentf53190a64f0b3d7e63f6d76cda18ddf7a51a4171
Merge PR #21315 into wip-sage-testing-20180410.153007

* refs/pull/21315/head:
qa/tasks/mgr/test_failover: fix for id -> name rename in mgr metadata

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>