From: Sage Weil <sage@inktank.com>
Date: Tue, 1 Oct 2013 22:32:59 +0000 (-0700)
Subject: osd/osd_types: bump encoding from 11 -> 12
X-Git-Tag: v0.71~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=011bff3405b06ed9c226cfbebaf9304295ecb184;p=ceph.git

osd/osd_types: bump encoding from 11 -> 12

Meant to do this in a1b82f2a568ba211601c12b0b33474e982a3be6f or
d421b66293fb3d815ad2cd4c787dd2c39f48d6e8 but forgot!

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 952f0cf75d78..1fecece92902 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -2823,7 +2823,7 @@ void object_info_t::encode(bufferlist& bl) const
        ++i) {
     old_watchers.insert(make_pair(i->first.second, i->second));
   }
-  ENCODE_START(11, 8, bl);
+  ENCODE_START(12, 8, bl);
   ::encode(soid, bl);
   ::encode(myoloc, bl);	//Retained for compatibility
   ::encode(category, bl);
@@ -2854,7 +2854,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(11, 8, 8, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(12, 8, 8, bl);
   map<entity_name_t, watch_info_t> old_watchers;
   if (struct_v >= 2 && struct_v <= 5) {
     sobject_t obj;