Merge branch 'next'

Conflicts:
	src/include/ceph_features.h

diff --cc src/include/ceph_features.h
index 242e239c667944440344ddfa33576ff44a577941,cf9c8d8c27f93dd0dda7e2162063b4cfcd54e31f..c9ff72c15f97390d9ad6fcbb2651a1ea6e9a813d
--- 1/src/include/ceph_features.h
--- 2/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
  

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge