From: Samuel Just Date: Mon, 8 Jul 2013 23:46:31 +0000 (-0700) Subject: Merge branch 'wip-small-object-recovery' X-Git-Tag: v0.67-rc1~138^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e93dd93e5439fb82c416cb8eec7f36598ae7b48;p=ceph.git Merge branch 'wip-small-object-recovery' Conflicts: src/include/ceph_features.h Reviewed-by: Sage Weil Fixes: #5278 --- 0e93dd93e5439fb82c416cb8eec7f36598ae7b48 diff --cc src/include/ceph_features.h index ce7f123c6bfe,579dcb3c0230..f72e1028898b --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@@ -37,7 -37,7 +37,8 @@@ #define CEPH_FEATURE_OSDHASHPSPOOL (1ULL<<30) #define CEPH_FEATURE_MON_SINGLE_PAXOS (1ULL<<31) #define CEPH_FEATURE_OSD_SNAPMAPPER (1ULL<<32) -#define CEPH_FEATURE_OSD_PACKED_RECOVERY (1ULL<<33) +#define CEPH_FEATURE_MON_SCRUB (1ULL<<33) ++#define CEPH_FEATURE_OSD_PACKED_RECOVERY (1ULL<<34) /* * Features supported. Should be everything above. @@@ -75,9 -75,8 +76,10 @@@ CEPH_FEATURE_MDSENC | \ CEPH_FEATURE_OSDHASHPSPOOL | \ CEPH_FEATURE_MON_SINGLE_PAXOS | \ - CEPH_FEATURE_OSD_SNAPMAPPER | \ - CEPH_FEATURE_OSD_PACKED_RECOVERY) + CEPH_FEATURE_OSD_SNAPMAPPER | \ + CEPH_FEATURE_MON_SCRUB | \ ++ CEPH_FEATURE_OSD_PACKED_RECOVERY | \ + 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL