From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 15 Sep 2020 02:25:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into wip-stretch-mode
X-Git-Tag: v16.1.0~1053^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9506d09e3b7be75919d70b3408ac95fbe81a7a0d;p=ceph.git

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

Conflicts:
	src/include/ceph_features.h

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

9506d09e3b7be75919d70b3408ac95fbe81a7a0d
diff --cc src/include/ceph_features.h
index 54bd3629cb26,78a74a6df691..f97440b54f50
--- a/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