From: Brad Hubbard <badone@users.noreply.github.com>
Date: Sat, 25 Feb 2017 23:23:43 +0000 (+1000)
Subject: Merge pull request #13485 from shinobu-x/wip-18644-kraken
X-Git-Tag: v11.2.1~215
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fa9248e92f34127ca8b0d3b021b5ac0da0f6609;p=ceph.git

Merge pull request #13485 from shinobu-x/wip-18644-kraken

kraken: osd: condition object_info_t encoding on required (not up) features

Reviewed-by: Nathan Cutler <ncutler@suse.com>
---

9fa9248e92f34127ca8b0d3b021b5ac0da0f6609