From: Sage Weil <sage@newdream.net>
Date: Thu, 5 Oct 2017 03:05:20 +0000 (-0500)
Subject: Merge pull request #18079 from liewegas/wip-21618
X-Git-Tag: v13.0.1~669
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f26c3c79a6e73fbab026a88e723a42a37fae2834;p=ceph.git

Merge pull request #18079 from liewegas/wip-21618

qa/standalone/scrub/osd-scrub-repair: no -y to diff

Reviewed-by: David Zafman <dzafman@redhat.com>
---

f26c3c79a6e73fbab026a88e723a42a37fae2834