From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Jun 2009 23:34:03 +0000 (-0700)
Subject: Merge commit '114ad5177f281b96ba6bbebe9ed85e2a4aec783f' into rados
X-Git-Tag: v0.9~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d01b24973d57be8c217af55e9efbb760e52c8d5e;p=ceph.git

Merge commit '114ad5177f281b96ba6bbebe9ed85e2a4aec783f' into rados

Conflicts:

	src/include/ceph_fs.h
---

d01b24973d57be8c217af55e9efbb760e52c8d5e
diff --cc src/include/ceph_fs.h
index 6fd3a3a9a731,d443ada1bef5..49a86779538f
--- a/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 */