From: Sage Weil <sage@redhat.com>
Date: Mon, 28 Aug 2017 19:23:46 +0000 (-0400)
Subject: mon: require SERVER_LUMINOUS from mons, osds
X-Git-Tag: v13.0.1~1005^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac8548ca97d9ceaa7a9f9fd8b566d1ca8bc219a6;p=ceph-ci.git

mon: require SERVER_LUMINOUS from mons, osds

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

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 3663bb04e4b..319ffbea0b4 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -679,13 +679,10 @@ int main(int argc, const char **argv)
   msgr->set_default_policy(Messenger::Policy::stateless_server(0));
   msgr->set_policy(entity_name_t::TYPE_MON,
                    Messenger::Policy::lossless_peer_reuse(
-		     CEPH_FEATURE_UID |
-		     CEPH_FEATURE_PGID64 |
-		     CEPH_FEATURE_MON_SINGLE_PAXOS));
+		     CEPH_FEATURE_SERVER_LUMINOUS));
   msgr->set_policy(entity_name_t::TYPE_OSD,
                    Messenger::Policy::stateless_server(
-		     CEPH_FEATURE_PGID64 |
-		     CEPH_FEATURE_OSDENC));
+		     CEPH_FEATURE_SERVER_LUMINOUS));
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
                    Messenger::Policy::stateless_server(0));
   msgr->set_policy(entity_name_t::TYPE_MDS,