From: Nathan Cutler <presnypreklad@gmail.com>
Date: Wed, 23 Nov 2016 20:53:40 +0000 (+0100)
Subject: Merge pull request #11927 from SUSE/wip-17764-hammer
X-Git-Tag: v0.94.10~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11886bd5d20c8b2bf09dbabda1e49f14d2283260;p=ceph.git

Merge pull request #11927 from SUSE/wip-17764-hammer

hammer: osd: fix collection_list shadow return value

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

11886bd5d20c8b2bf09dbabda1e49f14d2283260