]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: Correct the object_info_t::decode() version 6399/head
authorDavid Zafman <dzafman@redhat.com>
Mon, 12 Oct 2015 20:24:31 +0000 (13:24 -0700)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Oct 2015 19:44:33 +0000 (20:44 +0100)
commit052e15979bfbb69d1cd4d03fd90c8c5b104194c9
tree4bb07a7f8ec0a20f94b6546c819c115f5e9f346a
parentc551622ca21fe044bc1083614c45d888a2a34aeb
osd: Correct the object_info_t::decode() version

Caused by: 13b9dc70

Fixes: #13462
Backport: Hammer, Firefly

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2b7ddde685213f3908f2dd9545b35f1d97f35a79)

Conflicts:
src/osd/osd_types.cc
            In firefly we need 14 to match object_info_t::encode(), whereas
            in hammer and master the right value is 15.
src/osd/osd_types.cc