From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Feb 2020 00:17:06 +0000 (-0600)
Subject: Merge PR #33211 into master
X-Git-Tag: v15.1.1~461
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=207aca5325eb86e54b4e4d3b0101f9c29a7cd927;p=ceph.git

Merge PR #33211 into master

* refs/pull/33211/head:
	qa/tasks/mgr/dashboard/test_orchestrator: support addr attribute in inventory

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

207aca5325eb86e54b4e4d3b0101f9c29a7cd927