]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #22826 from smithfarm/wip-24738-mimic
authorYuri Weinstein <yweinste@redhat.com>
Wed, 11 Jul 2018 20:15:29 +0000 (13:15 -0700)
committerGitHub <noreply@github.com>
Wed, 11 Jul 2018 20:15:29 +0000 (13:15 -0700)
mimic: Bring back diff -y for non-FreeBSD

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

Trivial merge