]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitbf9fc38324869b2051b56856f13aa25b650125e7
tree7cc26347d08c29a1042a704b8a06e6a1b9f4a020
parentd2071779f1ac3f01bf619fc56db6829b7da95fe2
parente7d35cd7d1b4532576ca338b83a2f7e015d64e15
Merge pull request #22826 from smithfarm/wip-24738-mimic

mimic: Bring back diff -y for non-FreeBSD

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