From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Apr 2018 15:30:48 +0000 (-0500)
Subject: Merge PR #21315 into wip-sage-testing-20180410.153007
X-Git-Tag: v13.1.0~341
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbdbbbfc89a7e0467d7bd8fd272f3c812ab31eda;p=ceph.git

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>
---

dbdbbbfc89a7e0467d7bd8fd272f3c812ab31eda