diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/include/ceph_fs.h | 12 |
5 files changed, 30 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 4f0d0953e56..cef7f2c98b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ AUTOMAKE_OPTIONS = gnu -EXTRA_DIST = debian autogen.sh +EXTRA_DIST = debian autogen.sh ceph.spec.in SUBDIRS = src diff --git a/configure.ac b/configure.ac index 6ed01f6750b..cc924bc37bd 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET # Automake -AM_INIT_AUTOMAKE(ceph, 0.4) +AM_INIT_AUTOMAKE(ceph, 0.6) AM_PROG_CC_C_O # Platform diff --git a/debian/changelog b/debian/changelog index a7fab6b1721..cc7c55cf056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ceph (0.6-1) unstable; urgency=low + + * OSD scrub, fixes + * async metadata ops + +ceph (0.5-1) unstable; urgency=low + + * OSD bug fixes + * btrfs ioctl interface + * efficient snap recovery + * throttled osd recovery + * forced unmount + ceph (0.4-1) unstable; urgency=low * Snapshots. diff --git a/src/Makefile.am b/src/Makefile.am index c7196405dd4..5967c318be2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -162,7 +162,7 @@ noinst_LIBRARIES = \ noinst_LIBRARIES += libcrush_so.a #libcephclient_so.a # extra bits -EXTRA_DIST = mkcephfs.sh mkfs.sh restart.sh startnew.sh vstartnew.sh stop.sh crun +EXTRA_DIST = dstart.sh dstop.sh mkcephfs.sh montest.sh restart.sh stop.sh verify-mds-journal.sh vstart.sh crun # cleaning clean-local: @@ -268,6 +268,8 @@ noinst_HEADERS = \ client/fuse.h\ client/fuse_ll.h\ client/hadoop/CephFSInterface.h\ + cm.txt\ + common/debug.h\ common/lockdep.h\ common/BackTrace.h\ common/Clock.h\ @@ -306,6 +308,7 @@ noinst_HEADERS = \ ebofs/types.h\ include/Context.h\ include/Distribution.h\ + include/LogEntry.h\ include/assert.h\ include/atomic.h\ include/bitmapper.h\ @@ -370,6 +373,8 @@ noinst_HEADERS = \ kernel/super.c\ kernel/super.h\ kernel/types.h\ + mds/locks.c\ + mds/locks.h\ mds/Anchor.h\ mds/AnchorClient.h\ mds/AnchorServer.h\ @@ -449,6 +454,7 @@ noinst_HEADERS = \ messages/MHeartbeat.h\ messages/MInodeFileCaps.h\ messages/MLock.h\ + messages/MLog.h\ messages/MMDSBeacon.h\ messages/MMDSBoot.h\ messages/MMDSCacheRejoin.h\ @@ -483,6 +489,7 @@ noinst_HEADERS = \ messages/MOSDPGQuery.h\ messages/MOSDPGRemove.h\ messages/MOSDPing.h\ + messages/MOSDScrub.h\ messages/MOSDSubOp.h\ messages/MOSDSubOpReply.h\ messages/MPGStats.h\ @@ -494,6 +501,7 @@ noinst_HEADERS = \ mon/ClientMap.h\ mon/ClientMonitor.h\ mon/Elector.h\ + mon/LogMonitor.h\ mon/MDSMonitor.h\ mon/MonClient.h\ mon/MonMap.h\ diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index d9d4147ba99..fab4c82990f 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -31,7 +31,7 @@ * whenever the wire protocol changes. try to keep this string length * constant. */ -#define CEPH_BANNER "ceph 012\n" +#define CEPH_BANNER "ceph 013\n" #define CEPH_BANNER_MAX_LEN 30 /* @@ -40,12 +40,12 @@ * internal cluster protocols separately from the public, * client-facing protocol. */ -#define CEPH_OSD_PROTOCOL 3 /* cluster internal */ -#define CEPH_MDS_PROTOCOL 4 /* cluster internal */ +#define CEPH_OSD_PROTOCOL 4 /* cluster internal */ +#define CEPH_MDS_PROTOCOL 5 /* cluster internal */ #define CEPH_MON_PROTOCOL 4 /* cluster internal */ -#define CEPH_OSDC_PROTOCOL 3 /* public/client */ -#define CEPH_MDSC_PROTOCOL 4 /* public/client */ -#define CEPH_MONC_PROTOCOL 4 /* public/client */ +#define CEPH_OSDC_PROTOCOL 4 /* public/client */ +#define CEPH_MDSC_PROTOCOL 5 /* public/client */ +#define CEPH_MONC_PROTOCOL 6 /* public/client */ /* |