From: Sage Weil <sage@redhat.com>
Date: Mon, 22 Oct 2018 14:19:46 +0000 (-0500)
Subject: Merge PR #24689 into master
X-Git-Tag: v14.1.0~1133
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae583f5dde2500a53636a68d4e03d865ac413abc;p=ceph.git

Merge PR #24689 into master

* refs/pull/24689/head:
	qa/tasks/ceph_manager: fix get_stuck_pgs from pg dump change
	Merge PR #24625 into nautilus
	qa/suites/rados/mgr/tasks/module_selftest: whitelist 'foo bar security'

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

ae583f5dde2500a53636a68d4e03d865ac413abc