From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 22 Jun 2018 16:25:45 +0000 (-0700)
Subject: Merge pull request #21368 from smithfarm/wip-23675-luminous
X-Git-Tag: v12.2.6~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b26ff9f79a0cbdda8b888e5cd2bcec84fdf0070d;p=ceph.git

Merge pull request #21368 from smithfarm/wip-23675-luminous

luminous: qa/workunits/mon/test_mon_config_key.py fails on master

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

b26ff9f79a0cbdda8b888e5cd2bcec84fdf0070d