From: Jos Collin <jcollin@redhat.com>
Date: Wed, 19 Jul 2017 02:07:08 +0000 (+0000)
Subject: Merge pull request #16391 from Yan-waller/wip-walle-0718radososd
X-Git-Tag: ses5-milestone9~1^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07223aa86d066a42eaa51866efadde5d1d635d1a;p=ceph.git

Merge pull request #16391 from Yan-waller/wip-walle-0718radososd

osd: combine conditional statements

Reviewed-by: Jos Collin <jcollin@redhat.com>
---

07223aa86d066a42eaa51866efadde5d1d635d1a