From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 3 Aug 2018 15:21:13 +0000 (-0700)
Subject: Merge pull request #22848 from smithfarm/wip-24739-luminous
X-Git-Tag: v12.2.8~57
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=216185186abb4af3b85e513ef5da969ac71b87a8;p=ceph.git

Merge pull request #22848 from smithfarm/wip-24739-luminous

luminous: Bring back diff -y for non-FreeBSD

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

216185186abb4af3b85e513ef5da969ac71b87a8