Merge branch 'wip-small-object-recovery'

Conflicts:
	src/include/ceph_features.h

Reviewed-by: Sage Weil <sage@inktank.com>
Fixes: #5278

diff --cc src/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/include/ceph_features.h
index ce7f123c6bfe6a514680d537aa4514867075137a,579dcb3c02304957466f7a2b3c8c950f9c1082ff..f72e1028898b231fdc9c1da352541d3cb61fecba
--- 1/src/include/ceph_features.h
--- 2/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
  

diff --cc src/msg/Message.cc
Simple merge

diff --cc src/msg/Message.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge