From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 3 Aug 2017 23:20:20 +0000 (-0700)
Subject: Merge PR #16802 into master
X-Git-Tag: v12.1.3~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d89af4a3e88922fa9166577e03e3481ade6d2923;p=ceph-ci.git

Merge PR #16802 into master

* refs/remotes/upstream/pull/16802/head:
	qa: update wait_for_health for new health json syntax

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

d89af4a3e88922fa9166577e03e3481ade6d2923