Merge pull request #6335: object_info_t::decode() has wrong version

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Nov 16, 2015 · 1966859 · 1966859
2 parents 2ed4b4c + 0ad9521
commit 1966859
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
@@ -4283,7 +4283,7 @@ void object_info_t::encode(bufferlist& bl) const
 void object_info_t::decode(bufferlist::iterator& bl)
 {
   object_locator_t myoloc;
-  DECODE_START_LEGACY_COMPAT_LEN(14, 8, 8, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(15, 8, 8, bl);
   map<entity_name_t, watch_info_t> old_watchers;
   ::decode(soid, bl);
   ::decode(myoloc, bl);