]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>

Trivial merge