Merge remote-tracking branch 'gh/wip-mon-gv'

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Conflicts:
	src/include/ceph_features.h

diff --cc src/include/ceph_features.h
index ad2ef4ecec56c319198ca63123722fa919721a5d,0209d53b06f6aa71f85ab656eec582bfa40c78da..5c9a1493626efabeb877e14371497f98fa9b6a55
--- 1/src/include/ceph_features.h
--- 2/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@@ -24,7 -24,7 +24,8 @@@
  #define CEPH_FEATURE_INDEP_PG_MAP   (1<<17)
  #define CEPH_FEATURE_CRUSH_TUNABLES (1<<18)
  #define CEPH_FEATURE_CHUNKY_SCRUB   (1<<19)
 +#define CEPH_FEATURE_MON_NULLROUTE  (1<<20)
+ #define CEPH_FEATURE_MON_GV         (1<<21)
  
  /*
   * Features supported.  Should be everything above.
@@@ -49,8 -49,8 +50,9 @@@
         CEPH_FEATURE_MONENC |           \
         CEPH_FEATURE_INDEP_PG_MAP |     \
         CEPH_FEATURE_CRUSH_TUNABLES |   \
 -       CEPH_FEATURE_CHUNKY_SCRUB | \
 +       CEPH_FEATURE_CHUNKY_SCRUB |     \
-        CEPH_FEATURE_MON_NULLROUTE)
++       CEPH_FEATURE_MON_NULLROUTE |    \
+        CEPH_FEATURE_MON_GV)
  
  #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL
  

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

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