From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 12 Sep 2018 15:34:48 +0000 (+0800)
Subject: Merge pull request #24042 from liewegas/wip-merge-derr
X-Git-Tag: v14.0.1~314
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdfcb0f107810b4fec283f41741f7614bd7db0e2;p=ceph.git

Merge pull request #24042 from liewegas/wip-merge-derr

osd: remove stray derr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

cdfcb0f107810b4fec283f41741f7614bd7db0e2