From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 10 Apr 2018 19:55:56 +0000 (-0700)
Subject: Merge pull request #21192 from pdvian/wip-23524-luminous
X-Git-Tag: v12.2.5~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5a92509507fbdfff5bc26df15ea173e61492f53;p=ceph.git

Merge pull request #21192 from pdvian/wip-23524-luminous

luminous: is_qemu_running in qemu_rebuild_object_map.sh and qemu_dynamic_features.sh may return false positive

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

c5a92509507fbdfff5bc26df15ea173e61492f53