From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 16 Apr 2018 03:26:46 +0000 (-0700)
Subject: Merge PR #21322 into master
X-Git-Tag: v13.1.0~245
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bfce1bfbd34c5d9317b1c3b53151ed95cd02bf5;p=ceph.git

Merge PR #21322 into master

* refs/pull/21322/head:
	osdc: cleanup code.
	osdc: Remove useless condition.

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
---

9bfce1bfbd34c5d9317b1c3b53151ed95cd02bf5