From: Sage Weil <sage@inktank.com>
Date: Wed, 26 Sep 2012 16:47:18 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-mon-gv'
X-Git-Tag: v0.53~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=577184dd5b664491f7eeec8a8038c620f3ee3de5;p=ceph.git

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
---

577184dd5b664491f7eeec8a8038c620f3ee3de5
diff --cc src/include/ceph_features.h
index ad2ef4ecec56,0209d53b06f6..5c9a1493626e
--- a/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