From: Nathan Cutler <presnypreklad@gmail.com>
Date: Wed, 14 Jun 2017 07:47:48 +0000 (+0200)
Subject: Merge pull request #124 from SUSE/wip-pr15675
X-Git-Tag: ses5-milestone6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6984d41b5d142ce157216b6e757bcb547da2c7d2;p=ceph.git

Merge pull request #124 from SUSE/wip-pr15675

Possibly fix "ceph osd df" regression

Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Tim Serong <tserong@suse.com>
---

6984d41b5d142ce157216b6e757bcb547da2c7d2