From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 13 Feb 2013 00:55:32 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.58~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fec0fde4239e8410ed0103726d8db5a9768dad4;p=ceph.git

Merge branch 'next'

Conflicts:
	src/include/ceph_features.h
---

0fec0fde4239e8410ed0103726d8db5a9768dad4
diff --cc src/include/ceph_features.h
index 242e239c6679,cf9c8d8c27f9..c9ff72c15f97
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@@ -32,7 -32,7 +32,8 @@@
  #define CEPH_FEATURE_CRUSH_TUNABLES2 (1<<25)
  #define CEPH_FEATURE_CREATEPOOLID   (1<<26)
  #define CEPH_FEATURE_REPLY_CREATE_INODE   (1<<27)
- #define CEPH_FEATURE_MDSENC         (1<<28)
 -#define CEPH_FEATURE_OSD_HBMSGS  (1<<28)
++#define CEPH_FEATURE_OSD_HBMSGS     (1<<28)
++#define CEPH_FEATURE_MDSENC         (1<<29)
  
  /*
   * Features supported.  Should be everything above.
@@@ -66,7 -66,7 +67,8 @@@
  	 CEPH_FEATURE_CRUSH_TUNABLES2 |	     \
  	 CEPH_FEATURE_CREATEPOOLID |	     \
  	 CEPH_FEATURE_REPLY_CREATE_INODE |   \
 -	 CEPH_FEATURE_OSD_HBMSGS)
++	 CEPH_FEATURE_OSD_HBMSGS | \
 +	 CEPH_FEATURE_MDSENC)
  
  #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL