Merge remote-tracking branch 'origin/master' into wip-stretch-mode

Conflicts:
	src/include/ceph_features.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --cc qa/tasks/ceph.py
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/crush/CrushWrapper.h
Simple merge

diff --cc src/include/ceph_features.h
index 54bd3629cb264df30575fc0c471dff3e0429038e,78a74a6df691ecbb4c6d2e495e85d7f0702c77eb..f97440b54f50f303db1bf774498e73aeaab07d8b
--- 1/src/include/ceph_features.h
--- 2/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@@ -243,9 -244,9 +244,10 @@@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, R
         CEPH_FEATURE_CEPHX_V2 | \
         CEPH_FEATURE_OSD_PGLOG_HARDLIMIT | \
         CEPH_FEATUREMASK_SERVER_OCTOPUS | \
 +       CEPH_FEATUREMASK_STRETCH_MODE | \
         CEPH_FEATUREMASK_OSD_REPOP_MLCOD | \
         CEPH_FEATUREMASK_SERVER_PACIFIC | \
+        CEPH_FEATURE_OSD_FIXED_COLLECTION_LIST | \
         0ULL)
  
  #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/Monitor.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/mon/Session.h
Simple merge

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

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

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

diff --cc src/osd/PeeringState.h
Simple merge

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

diff --cc src/osd/osd_types.h
Simple merge