Merge commit '114ad5177f281b96ba6bbebe9ed85e2a4aec783f' into rados

Conflicts:

	src/include/ceph_fs.h

diff --cc src/include/ceph_fs.h
index 6fd3a3a9a731a64be8f04ba19bb4c87c966db2cb,d443ada1bef565eee6b9cd9f6bd0b5647d52e2a4..49a86779538f633dcb6ce0c9391bbf2fef1f2bba
--- 1/src/include/ceph_fs.h
--- 2/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@@ -26,8 -26,8 +26,8 @@@
  #define CEPH_OSD_PROTOCOL     5 /* cluster internal */
  #define CEPH_MDS_PROTOCOL     9 /* cluster internal */
  #define CEPH_MON_PROTOCOL     4 /* cluster internal */
 -#define CEPH_OSDC_PROTOCOL   17 /* public/client */
 +#define CEPH_OSDC_PROTOCOL   18 /* public/client */
- #define CEPH_MDSC_PROTOCOL   21 /* public/client */
+ #define CEPH_MDSC_PROTOCOL   22 /* public/client */
  #define CEPH_MONC_PROTOCOL   12 /* public/client */