From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 27 Jun 2017 04:03:06 +0000 (+0800)
Subject: Merge pull request #15914 from wjwithagen/remotes/origin/wip-wjw-freebsd-osd-scrub... 
X-Git-Tag: v12.1.2~1^2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51601f57dbf4f094e7c4256a53ac9b5774c2dbb7;p=ceph.git

Merge pull request #15914 from wjwithagen/remotes/origin/wip-wjw-freebsd-osd-scrub-repair-3

test/osd/osd-scrub-repair.sh: Fix diff options on FreeBSD

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

51601f57dbf4f094e7c4256a53ac9b5774c2dbb7