From: Sage Weil <sage@newdream.net>
Date: Thu, 15 Jun 2017 21:33:52 +0000 (-0500)
Subject: Merge pull request #15687 from xiexingguo/wip-fix-decode-oi
X-Git-Tag: v12.1.0~122
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f05c965ee653ee321483ee68d88346aa583b97aa;p=ceph.git

Merge pull request #15687 from xiexingguo/wip-fix-decode-oi

osd/OSD: bump up current version; conditionally encoding manifest into oi

Reviewed-by: Sage Weil <sage@redhat.com>
---

f05c965ee653ee321483ee68d88346aa583b97aa