]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15687 from xiexingguo/wip-fix-decode-oi
authorSage Weil <sage@newdream.net>
Thu, 15 Jun 2017 21:33:52 +0000 (16:33 -0500)
committerGitHub <noreply@github.com>
Thu, 15 Jun 2017 21:33:52 +0000 (16:33 -0500)
osd/OSD: bump up current version; conditionally encoding manifest into oi

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PrimaryLogPG.cc

Simple merge