Merge branch 'unstable' into nofilltrace

Conflicts:

	src/include/ceph_fs.h

diff --cc src/Makefile.am
Simple merge

diff --cc src/include/ceph_fs.h
index fa62f4c62a0a1766ed3b6c3e6475366accb88d39,cf5704fd78e412417d6ec86580c7784d7c940c9d..6f666bc500a8dbe3ca19db3233ebd846d1b33703
--- 1/src/include/ceph_fs.h
--- 2/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@@ -44,8 -44,8 +44,8 @@@
  #define CEPH_MDS_PROTOCOL     7 /* cluster internal */
  #define CEPH_MON_PROTOCOL     4 /* cluster internal */
  #define CEPH_OSDC_PROTOCOL    6 /* public/client */
 -#define CEPH_MDSC_PROTOCOL   12 /* public/client */
 -#define CEPH_MONC_PROTOCOL   10 /* public/client */
 +#define CEPH_MDSC_PROTOCOL   14 /* public/client */
- #define CEPH_MONC_PROTOCOL    9 /* public/client */
++#define CEPH_MONC_PROTOCOL   11 /* public/client */
  
  
  /*

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

diff --cc src/msg/Message.cc
Simple merge