Merge lp:~ubuntu-branches/ubuntu/natty/ceph/natty-201103250159 into lp:ubuntu/natty/ceph

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/ceph now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/ceph/natty-201103250159. A merge should be performed if necessary.

Unmerged revisions

6. By Micah Gersten on 2011-02-13

debian/control: add Homepage

5. By Clint Byrum on 2011-02-07

* Removed .la files from libceph1-dev, libcrush1-dev and
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/watch: added watch file

4. By Clint Byrum on 2011-02-07

* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libcrush1-dev and librados1-dev (per Debian
  policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev

3. By Clint Byrum on 2011-02-07

New upstream release.

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-03-28 07:08:46 +0000
@@ -0,0 +1,1 @@
+2
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-03-28 07:08:46 +0000
@@ -0,0 +1,1 @@
+fix-mkcephfs-path.patch
 
=== added directory '.pc/fix-mkcephfs-path.patch'
=== added directory '.pc/fix-mkcephfs-path.patch/src'
=== added file '.pc/fix-mkcephfs-path.patch/src/Makefile.am'
--- .pc/fix-mkcephfs-path.patch/src/Makefile.am	1970-01-01 00:00:00 +0000
+++ .pc/fix-mkcephfs-path.patch/src/Makefile.am	2011-03-28 07:08:46 +0000
@@ -0,0 +1,772 @@
+#
+# note: the old Makefile is at Makefile.old
+#
+
+AUTOMAKE_OPTIONS = gnu
+
+bin_PROGRAMS =
+sbin_PROGRAMS =
+bin_SCRIPTS = crun
+
+# monitor
+cmon_SOURCES = cmon.cc msg/SimpleMessenger.cc
+cmon_LDADD = libmon.a libcrush.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += cmon
+
+# osd
+cosd_SOURCES = cosd.cc msg/SimpleMessenger.cc objclass/class_debug.cc \
+	       objclass/class_api.cc
+cosd_LDADD = libosd.a libos.a libcrush.a libcommon.a -ldl -lpthread -lm -lcrypto
+bin_PROGRAMS += cosd
+
+# mds
+cmds_SOURCES = cmds.cc msg/SimpleMessenger.cc
+cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += cmds
+
+# admin tools
+ceph_SOURCES = ceph.cc msg/SimpleMessenger.cc
+ceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm -lcrypto
+cconf_SOURCES = cconf.cc
+cconf_LDADD = libcommon.a -lpthread -lm -lcrypto
+cauthtool_SOURCES = cauthtool.cc
+cauthtool_LDADD = libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += ceph cconf cauthtool
+
+monmaptool_SOURCES = monmaptool.cc
+monmaptool_LDADD = libcommon.a -lpthread -lm -lcrypto
+crushtool_SOURCES = crushtool.cc
+crushtool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto
+osdmaptool_SOURCES = osdmaptool.cc
+osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += monmaptool crushtool osdmaptool
+
+mount_ceph_SOURCES = mount/mount.ceph.c
+noinst_PROGRAMS = mount.ceph
+
+# synthetic client
+csyn_SOURCES = csyn.cc msg/SimpleMessenger.cc
+csyn_LDADD = libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += csyn
+
+core: cmon cosd cmds ceph cconf monmaptool osdmaptool crushtool csyn
+
+
+# fuse targets?
+if WITH_FUSE
+cfuse_SOURCES = cfuse.cc msg/SimpleMessenger.cc client/fuse.cc client/fuse_ll.cc
+cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += cfuse
+
+#if WITH_DEBUG
+#fakefuse_SOURCES = fakefuse.cc msg/FakeMessenger.cc client/fuse.cc client/fuse_ll.cc
+#fakefuse_LDADD = -lfuse libmon.a libmds.a libosd.a libos.a \
+#	libclient.a libosdc.a libcrush.a 
+#bin_PROGRAMS += fakefuse
+#endif
+
+endif
+
+# debug targets?
+if WITH_DEBUG
+
+psim_SOURCES = psim.cc
+psim_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += psim
+
+testmsgr_SOURCES = testmsgr.cc msg/SimpleMessenger.cc
+testmsgr_LDADD = libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += testmsgr
+
+test_ioctls_SOURCES = client/test_ioctls.c
+bin_PROGRAMS += test_ioctls
+
+dumpjournal_SOURCES = dumpjournal.cc msg/SimpleMessenger.cc
+dumpjournal_LDADD = libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto
+dupstore_SOURCES = dupstore.cc
+dupstore_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto
+streamtest_SOURCES = streamtest.cc
+streamtest_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += dumpjournal dupstore streamtest
+
+test_trans_SOURCES = test_trans.cc
+test_trans_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += test_trans
+
+
+#fakesyn_SOURCES = fakesyn.cc msg/FakeMessenger.cc
+#fakesyn_LDADD = libmon.a libmds.a libosd.a libos.a \
+#	libclient.a libosdc.a libcrush.a libcommon.a
+#bin_PROGRAMS += fakesyn
+
+endif
+
+
+##########
+BUILT_SOURCES =
+lib_LTLIBRARIES = 
+
+# libcrush.so
+libcrush_la_SOURCES = \
+	crush/builder.c \
+	crush/mapper.c \
+	crush/crush.c \
+	crush/hash.c
+libcrush_la_CFLAGS = ${AM_CFLAGS}
+libcrush_la_CXXFLAGS = ${AM_CXXFLAGS}
+libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*' -lm
+lib_LTLIBRARIES += libcrush.la
+
+# libceph
+libceph_la_SOURCES = \
+	libceph.cc \
+	client/Client.cc \
+	msg/SimpleMessenger.cc \
+	${libcommon_a_SOURCES} \
+	${libosdc_a_SOURCES}
+libceph_la_CFLAGS = ${AM_CFLAGS}
+libceph_la_CXXFLAGS= ${AM_CXXFLAGS}
+libceph_la_LIBADD = libcrush.la
+libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*' -lpthread -lssl
+lib_LTLIBRARIES += libceph.la
+
+if WITH_DEBUG
+testceph_SOURCES = client/testceph.cc
+testceph_LDADD = libceph.la libcrush.la -lpthread -lm -lcrypto
+bin_PROGRAMS += testceph
+endif
+
+# librados
+librados_SOURCES = \
+	librados.cc \
+	msg/SimpleMessenger.cc \
+	osdc/Objecter.cc \
+	${libcommon_a_SOURCES}
+librados_la_SOURCES = ${librados_SOURCES}
+librados_la_CFLAGS = ${AM_CFLAGS}
+librados_la_CXXFLAGS = ${AM_CXXFLAGS}
+librados_la_LIBADD = libcrush.la
+librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*' -lpthread
+lib_LTLIBRARIES += librados.la
+
+librados_a_SOURCES = ${librados_SOURCES}
+librados_a_CFLAGS = ${AM_CFLAGS}
+librados_a_CXXFLAGS = ${AM_CXXFLAGS}
+
+rados_SOURCES = rados.cc
+rados_LDADD = librados.la -lpthread -lm -lcrypto
+bin_PROGRAMS += rados
+
+if WITH_DEBUG
+testrados_SOURCES = testrados.c
+testrados_LDADD = librados.la -lpthread -lm -lcrypto
+testradospp_SOURCES = testradospp.cc
+testradospp_LDADD = librados.la -lpthread -lm -lcrypto
+bin_PROGRAMS += testrados testradospp
+endif
+
+radosacl_SOURCES = radosacl.cc
+radosacl_LDADD = librados.la -lpthread -lm -lcrypto
+rbd_SOURCES = rbd.cc
+rbd_LDADD = librados.la -lpthread -lm -lcrypto
+bin_PROGRAMS += radosacl rbd
+
+if WITH_RADOSGW
+libradosgw_a_SOURCES = \
+	rgw/rgw_fs.cc \
+	rgw/rgw_rados.cc \
+	rgw/rgw_acl.cc \
+	rgw/rgw_user.cc \
+	rgw/rgw_access.cc \
+	rgw/rgw_op.cc \
+	rgw/rgw_rest.cc \
+	rgw/rgw_common.cc
+libradosgw_a_CFLAGS = ${AM_CFLAGS}
+# lib_LTLIBRARIES += libradosgw.a
+
+radosgw_SOURCES = rgw/rgw_main.cc
+radosgw_LDADD = libradosgw.a librados.a libcrush.a -lfcgi -lcrypto -lexpat -lpthread -lm
+radosgw_admin_SOURCES = rgw/rgw_admin.cc
+radosgw_admin_LDADD = libradosgw.a librados.a libcrush.a -lfcgi -lcrypto -lexpat -lpthread -lm
+bin_PROGRAMS += radosgw radosgw_admin
+endif
+
+if WITH_DEBUG
+testcrypto_SOURCES = testcrypto.cc
+testcrypto_LDADD = libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += testcrypto
+
+testkeys_SOURCES = testkeys.cc
+testkeys_LDADD = libmon.a libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += testkeys
+endif
+
+
+## rados object classes
+
+#libcls_crypto.so: cls_crypto.cc
+#	${CXX} -I. -fPIC -shared -g -o libcls_crypto.so -lcrypto cls_crypto.cc
+#BUILT_SOURCES += libcls_crypto.so
+
+#libcls_acl.so: cls_acl.cc
+#	${CXX} -I. -fPIC -shared -g -o libcls_acl.so cls_acl.cc
+#BUILT_SOURCES += libcls_acl.so
+
+# rbd: rados block device class
+libcls_rbd_la_SOURCES = cls_rbd.cc
+libcls_rbd_la_CFLAGS = ${AM_CFLAGS}
+libcls_rbd_la_CXXFLAGS= ${AM_CXXFLAGS}
+libcls_rbd_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '.*__cls_.*' -lpthread
+
+radoslibdir = $(libdir)/rados-classes
+radoslib_LTLIBRARIES = libcls_rbd.la
+
+
+## hadoop client
+if WITH_HADOOPCLIENT
+JAVA_BASE = /usr/lib/jvm/java-6-sun
+libhadoopcephfs_la_SOURCES = client/hadoop/CephFSInterface.cc
+libhadoopcephfs_la_LIBADD = libceph.la
+libhadoopcephfs_la_CFLAGS = ${AM_CFLAGS}
+libhadoopcephfs_la_CXXFLAGS = ${AM_CXXFLAGS}
+libhadoopcephfs_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'hadoopcephfs_.*'
+lib_LTLIBRARIES += libhadoopcephfs.la
+endif
+
+
+# shell scripts
+editpaths = sed \
+	-e 's|@bindir[@]|$(bindir)|g' \
+	-e 's|@libdir[@]|$(libdir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@datadir[@]|$(pkgdatadir)|g' \
+	-e 's|@prefix[@]|$(prefix)|g'
+
+init-ceph mkcephfs cclass: init-ceph.in mkcephfs.in cclass.in Makefile
+	rm -f $@ $@.tmp
+	$(editpaths) '$(srcdir)/$@.in' >$@.tmp
+	chmod +x $@.tmp
+	chmod a-w $@.tmp
+	mv $@.tmp $@
+
+BUILT_SOURCES += init-ceph mkcephfs cclass
+
+##
+LDADD =
+
+
+AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
+AM_CFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic
+AM_LDFLAGS =
+
+if WITH_LIBATOMIC
+AM_LDFLAGS += -latomic_ops
+endif
+
+noinst_LIBRARIES = \
+	libcommon.a libcrush.a \
+	libmon.a libmds.a libosdc.a libosd.a libclient.a \
+	libos.a librados.a libradosgw.a
+
+noinst_LIBRARIES +=  #libcephclient_so.a
+
+# extra bits
+EXTRA_DIST = verify-mds-journal.sh vstart.sh stop.sh \
+	     crun ceph_common.sh init-ceph.in mkcephfs.in cclass.in cclsinfo make_version check_version
+
+install-data-local:
+	$(install_sh_SCRIPT) -m 0755 cclass $(DESTDIR)$(bindir)/cclass
+	$(install_sh_SCRIPT) -m 0755 cclsinfo $(DESTDIR)$(bindir)/cclsinfo
+	sh -c "if [ \"$(sbindir)\" = \"/usr/sbin\" ]; then mkdir -p $(DESTDIR)/sbin ; $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)/sbin/mount.ceph ; else mkdir -p $(DESTDIR)$(sbindir) ; $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)$(sbindir)/mount.ceph ; fi"
+	mkdir -p $(DESTDIR)$(sbindir)/ceph
+	$(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs
+	mkdir -p $(DESTDIR)$(libdir)/ceph
+	$(install_sh_SCRIPT) -m 0755 ceph_common.sh $(DESTDIR)$(libdir)/ceph/ceph_common.sh
+	mkdir -p $(DESTDIR)$(sysconfdir)/ceph
+	$(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(sysconfdir)/ceph/sample.ceph.conf
+	$(install_sh_SCRIPT) -m 0755 fetch_config $(DESTDIR)$(sysconfdir)/ceph/sample.fetch_config
+	mkdir -p $(DESTDIR)$(includedir)/ceph
+	$(install_sh_SCRIPT) -m 0644 client/libceph.h $(DESTDIR)$(includedir)/ceph/libceph.h
+	mkdir -p $(DESTDIR)$(includedir)/rados
+	$(install_sh_SCRIPT) -m 0644 include/librados.h $(DESTDIR)$(includedir)/rados/librados.h
+	$(install_sh_SCRIPT) -m 0644 include/librados.hpp $(DESTDIR)$(includedir)/rados/librados.hpp
+	$(install_sh_SCRIPT) -m 0644 include/buffer.h $(DESTDIR)$(includedir)/rados/buffer.h
+	$(install_sh_SCRIPT) -m 0644 include/atomic.h $(DESTDIR)$(includedir)/rados/atomic.h
+	$(install_sh_SCRIPT) -m 0644 include/page.h $(DESTDIR)$(includedir)/rados/page.h
+	$(install_sh_SCRIPT) -m 0644 include/crc32c.h $(DESTDIR)$(includedir)/rados/crc32c.h
+	$(install_sh_SCRIPT) -m 0644 include/Spinlock.h $(DESTDIR)$(includedir)/rados/Spinlock.h
+	$(install_sh_SCRIPT) -m 0644 include/assert.h $(DESTDIR)$(includedir)/rados/assert.h
+	mkdir -p $(DESTDIR)$(includedir)/crush
+	$(install_sh_SCRIPT) -m 0644 crush/hash.h $(DESTDIR)$(includedir)/crush/hash.h
+	$(install_sh_SCRIPT) -m 0644 crush/crush.h $(DESTDIR)$(includedir)/crush/crush.h
+	$(install_sh_SCRIPT) -m 0644 crush/types.h $(DESTDIR)$(includedir)/crush/types.h
+	$(install_sh_SCRIPT) -m 0644 crush/mapper.h $(DESTDIR)$(includedir)/crush/mapper.h
+
+FORCE:
+.git_version: FORCE
+	./check_version .git_version
+ceph_ver.h: .git_version
+	./make_version .git_version ceph_ver.h
+
+ceph_ver.c: ceph_ver.h
+common/debug.cc: ceph_ver.h 
+config.cc: ceph_ver.h
+
+
+
+# cleaning
+clean-local:
+	-rm *.so
+#	-rm crush/*.cxx
+#	-rm CrushWrapper.pm
+
+# libs
+libcommon_a_SOURCES = \
+	ceph_ver.c \
+	$(libcommon_files)
+
+# this list ommits the ceph_ver.c file
+libcommon_files = \
+	auth/AuthAuthorizeHandler.cc \
+	auth/AuthClientHandler.cc \
+	auth/AuthSupported.cc \
+	auth/cephx/CephxAuthorizeHandler.cc \
+	auth/cephx/CephxClientHandler.cc \
+	auth/cephx/CephxProtocol.cc \
+	auth/none/AuthNoneAuthorizeHandler.cc \
+	auth/Crypto.cc \
+	auth/ExportControl.cc \
+	auth/KeyRing.cc \
+	auth/RotatingKeyRing.cc \
+	common/LogClient.cc \
+	msg/Message.cc \
+	msg/msg_types.cc \
+	common/BackTrace.cc \
+	common/Logger.cc \
+	common/ClassLibrary.cc \
+	common/Clock.cc \
+	common/Timer.cc \
+	common/Finisher.cc \
+	common/sctp_crc32.c\
+	common/assert.cc \
+	common/dyn_snprintf.c \
+	common/WorkQueue.cc \
+	common/ConfUtils.cc \
+	common/MemoryModel.cc \
+	common/armor.c \
+	common/base64.c \
+	common/str_list.cc \
+	mon/MonMap.cc \
+	mon/MonClient.cc \
+	osd/OSDMap.cc \
+	mds/MDSMap.cc \
+	common/tls.cc \
+	common/common_init.cc \
+	common/buffer.cc \
+	common/debug.cc \
+	include/ceph_fs.cc \
+	include/ceph_hash.cc \
+	include/ceph_strings.cc \
+	include/ceph_frag.cc \
+	config.cc \
+	common/page.cc \
+	common/lockdep.cc
+
+libcrush_a_SOURCES = \
+	crush/builder.c \
+	crush/mapper.c \
+	crush/crush.c \
+	crush/hash.c
+
+libmon_a_SOURCES = \
+	auth/cephx/CephxKeyServer.cc \
+	auth/cephx/CephxServiceHandler.cc \
+	auth/AuthServiceHandler.cc \
+	mon/Monitor.cc \
+	mon/Paxos.cc \
+	mon/PaxosService.cc \
+	mon/OSDMonitor.cc \
+	mon/MDSMonitor.cc \
+	mon/MonmapMonitor.cc \
+	mon/PGMonitor.cc \
+	mon/LogMonitor.cc \
+	mon/ClassMonitor.cc \
+	mon/AuthMonitor.cc \
+	mon/Elector.cc \
+	mon/MonitorStore.cc \
+	mon/MonCaps.cc
+
+libmds_a_SOURCES = \
+	mds/MDS.cc \
+	mds/locks.c \
+	mds/journal.cc \
+	mds/Server.cc \
+	mds/MDCache.cc \
+	mds/Locker.cc \
+	mds/Migrator.cc \
+	mds/MDBalancer.cc \
+	mds/CDentry.cc \
+	mds/CDir.cc \
+	mds/CInode.cc \
+	mds/LogEvent.cc \
+	mds/MDSTable.cc \
+	mds/InoTable.cc \
+	mds/MDSTableClient.cc \
+	mds/MDSTableServer.cc \
+	mds/AnchorServer.cc \
+	mds/AnchorClient.cc \
+	mds/SnapServer.cc \
+	mds/snap.cc \
+	mds/SessionMap.cc \
+	mds/MDLog.cc
+
+libos_a_SOURCES = \
+	os/FileJournal.cc \
+	os/FileStore.cc \
+	os/JournalingObjectStore.cc
+
+libosd_a_SOURCES = \
+	osd/PG.cc \
+	osd/ReplicatedPG.cc \
+	osd/Ager.cc \
+	osd/OSD.cc \
+	osd/OSDCaps.cc \
+        common/ClassHandler.cc
+#	osd/RAID4PG.cc
+
+libosdc_a_SOURCES = \
+	osdc/Objecter.cc \
+	osdc/ObjectCacher.cc \
+	osdc/Filer.cc \
+	osdc/Journaler.cc
+
+libclient_a_SOURCES = \
+	client/Client.cc \
+	client/SyntheticClient.cc \
+	client/Trace.cc
+
+# headers... and everything else we want to include in a 'make dist' 
+# that autotools doesn't magically identify.
+noinst_HEADERS = \
+	auth/cephx/CephxAuthorizeHandler.h\
+	auth/cephx/CephxKeyServer.h\
+	auth/cephx/CephxProtocol.h\
+	auth/cephx/CephxClientHandler.h\
+	auth/cephx/CephxServiceHandler.h\
+	auth/none/AuthNoneAuthorizeHandler.h\
+	auth/none/AuthNoneClientHandler.h\
+	auth/none/AuthNoneServiceHandler.h\
+	auth/none/AuthNoneProtocol.h\
+	auth/Auth.h\
+	auth/AuthSupported.h\
+	auth/AuthClientHandler.h\
+	auth/AuthServiceHandler.h\
+	auth/AuthAuthorizeHandler.h\
+	auth/KeyRing.h\
+	auth/RotatingKeyRing.h\
+	auth/Crypto.h\
+	auth/ExportControl.h\
+	ceph_ver.h \
+        client/Client.h\
+        client/SyntheticClient.h\
+        client/Trace.h\
+        client/fuse.h\
+        client/fuse_ll.h\
+	client/ioctl.h\
+	client/libceph.h\
+        client/hadoop/CephFSInterface.h\
+	cls_acl.cc\
+	cls_crypto.cc\
+	cm.txt\
+        common/arch.h\
+        common/armor.h\
+	common/base64.h\
+	common/debug.h\
+	common/lockdep.h\
+	common/BackTrace.h\
+        common/ClassVersion.h\
+        common/Clock.h\
+        common/common_init.h\
+        common/Cond.h\
+        common/dyn_snprintf.h\
+        common/ClassHandler.h\
+        common/ConfUtils.h\
+        common/DecayCounter.h\
+        common/Finisher.h\
+        common/LogType.h\
+        common/Logger.h\
+        common/MemoryModel.h\
+        common/Mutex.h\
+        common/RWLock.h\
+        common/Semaphore.h\
+        common/Thread.h\
+        common/Throttle.h\
+        common/Timer.h\
+        common/tls.h\
+	common/WorkQueue.h\
+	common/LogClient.h\
+        config.h\
+        crush/CrushWrapper.h\
+        crush/CrushWrapper.i\
+        crush/builder.h\
+        crush/crush.h\
+        crush/grammar.h\
+        crush/hash.h\
+        crush/mapper.h\
+        crush/sample.txt\
+        crush/types.h\
+	fetch_config\
+	include/ClassLibrary.h\
+        include/Context.h\
+	include/CompatSet.h\
+        include/Distribution.h\
+	include/LogEntry.h\
+	include/Spinlock.h\
+	include/assert.h\
+        include/atomic.h\
+        include/bitmapper.h\
+        include/blobhash.h\
+        include/buffer.h\
+        include/byteorder.h\
+	include/ceph_frag.h\
+        include/ceph_fs.h\
+        include/ceph_hash.h\
+	include/color.h\
+	include/crc32c.h\
+        include/cstring.h\
+        include/encoding.h\
+        include/err.h\
+        include/error.h\
+        include/filepath.h\
+        include/frag.h\
+        include/hash.h\
+        include/intarith.h\
+        include/interval_set.h\
+        include/inttypes.h\
+	include/librados.h\
+	include/librados.hpp\
+        include/lru.h\
+	include/msgr.h\
+        include/nstring.h\
+        include/object.h\
+        include/page.h\
+        include/rangeset.h\
+	include/rados.h\
+	include/rbd_types.h\
+        include/statlite.h\
+	include/str_list.h\
+        include/triple.h\
+        include/tstring.h\
+        include/types.h\
+        include/uofs.h\
+        include/utime.h\
+        include/dlist.h\
+        include/elist.h\
+        include/xlist.h\
+	mds/locks.c\
+	mds/locks.h\
+        mds/Anchor.h\
+        mds/AnchorClient.h\
+        mds/AnchorServer.h\
+        mds/CDentry.h\
+        mds/CDir.h\
+        mds/CInode.h\
+        mds/Capability.h\
+        mds/InoTable.h\
+        mds/LocalLock.h\
+        mds/Locker.h\
+        mds/LogEvent.h\
+        mds/LogSegment.h\
+        mds/MDBalancer.h\
+        mds/MDCache.h\
+        mds/MDLog.h\
+        mds/MDS.h\
+        mds/MDSMap.h\
+	mds/MDSTable.h\
+	mds/MDSTableServer.h\
+	mds/MDSTableClient.h\
+        mds/Migrator.h\
+        mds/ScatterLock.h\
+        mds/Server.h\
+        mds/SessionMap.h\
+        mds/SimpleLock.h\
+        mds/SnapClient.h\
+        mds/SnapServer.h\
+        mds/events/ECommitted.h\
+        mds/events/EExport.h\
+        mds/events/EFragment.h\
+        mds/events/EImportFinish.h\
+        mds/events/EImportStart.h\
+        mds/events/EMetaBlob.h\
+        mds/events/EOpen.h\
+        mds/events/ESession.h\
+        mds/events/ESessions.h\
+        mds/events/ESlaveUpdate.h\
+        mds/events/EString.h\
+        mds/events/ESubtreeMap.h\
+	mds/events/ETableClient.h\
+	mds/events/ETableServer.h\
+        mds/events/EUpdate.h\
+        mds/mds_table_types.h\
+        mds/mdstypes.h\
+        mds/snap.h\
+        messages/MAuth.h\
+        messages/MAuthReply.h\
+	messages/MCacheExpire.h\
+	messages/MClass.h\
+	messages/MClassAck.h\
+        messages/MClientCaps.h\
+        messages/MClientCapRelease.h\
+        messages/MClientLease.h\
+        messages/MClientReconnect.h\
+        messages/MClientReply.h\
+        messages/MClientRequest.h\
+        messages/MClientRequestForward.h\
+        messages/MClientSession.h\
+        messages/MClientSnap.h\
+        messages/MDentryLink.h\
+        messages/MDentryUnlink.h\
+        messages/MDirUpdate.h\
+        messages/MDiscover.h\
+        messages/MDiscoverReply.h\
+        messages/MExportCaps.h\
+        messages/MExportCapsAck.h\
+        messages/MExportDir.h\
+        messages/MExportDirAck.h\
+        messages/MExportDirCancel.h\
+        messages/MExportDirDiscover.h\
+        messages/MExportDirDiscoverAck.h\
+        messages/MExportDirFinish.h\
+        messages/MExportDirNotify.h\
+        messages/MExportDirNotifyAck.h\
+        messages/MExportDirPrep.h\
+        messages/MExportDirPrepAck.h\
+        messages/MGenericMessage.h\
+        messages/MGetPoolStats.h\
+        messages/MGetPoolStatsReply.h\
+        messages/MHeartbeat.h\
+        messages/MInodeFileCaps.h\
+        messages/MLock.h\
+	messages/MLog.h\
+	messages/MLogAck.h\
+        messages/MMDSBeacon.h\
+        messages/MMDSCacheRejoin.h\
+	messages/MMDSLoadTargets.h\
+        messages/MMDSFragmentNotify.h\
+        messages/MMDSMap.h\
+        messages/MMDSResolve.h\
+        messages/MMDSResolveAck.h\
+        messages/MMDSSlaveRequest.h\
+        messages/MMDSTableRequest.h\
+        messages/MMonCommand.h\
+        messages/MMonCommandAck.h\
+        messages/MMonElection.h\
+        messages/MMonGetMap.h\
+	messages/MMonGlobalID.h\
+        messages/MMonMap.h\
+        messages/MMonObserve.h\
+        messages/MMonObserveNotify.h\
+        messages/MMonPaxos.h\
+        messages/MMonSubscribe.h\
+        messages/MMonSubscribeAck.h\
+        messages/MOSDAlive.h\
+        messages/MOSDBoot.h\
+        messages/MOSDFailure.h\
+        messages/MOSDMap.h\
+        messages/MOSDOp.h\
+        messages/MOSDOpReply.h\
+        messages/MOSDPGCreate.h\
+        messages/MOSDPGInfo.h\
+        messages/MOSDPGLog.h\
+        messages/MOSDPGNotify.h\
+        messages/MOSDPGQuery.h\
+        messages/MOSDPGRemove.h\
+        messages/MOSDPGTemp.h\
+        messages/MOSDPGTrim.h\
+        messages/MOSDPing.h\
+	messages/MOSDScrub.h\
+        messages/MOSDSubOp.h\
+        messages/MOSDSubOpReply.h\
+        messages/MPGStats.h\
+        messages/MPGStatsAck.h\
+        messages/MPing.h\
+	messages/MPoolOp.h\
+	messages/MPoolOpReply.h\
+        messages/MRemoveSnaps.h\
+	messages/MRoute.h\
+	messages/MForward.h\
+        messages/MStatfs.h\
+        messages/MStatfsReply.h\
+	messages/PaxosServiceMessage.h\
+	mon/AuthMonitor.h\
+        mon/ClassMonitor.h\
+        mon/Elector.h\
+	mon/LogMonitor.h\
+        mon/MDSMonitor.h\
+	mon/MonmapMonitor.h\
+        mon/MonCaps.h\
+        mon/MonClient.h\
+        mon/MonMap.h\
+        mon/Monitor.h\
+        mon/MonitorStore.h\
+        mon/OSDMonitor.h\
+        mon/PGMap.h\
+        mon/PGMonitor.h\
+        mon/Paxos.h\
+        mon/PaxosService.h\
+        mon/Session.h\
+        mon/mon_types.h\
+	mount/canonicalize.c\
+	mount/mtab.c\
+        msg/Dispatcher.h\
+        msg/FakeMessenger.h\
+        msg/Message.h\
+        msg/Messenger.h\
+        msg/SimpleMessenger.h\
+        msg/msg_types.h\
+        msg/tcp.cc\
+        msg/tcp.h\
+	objclass/objclass.h\
+	os/btrfs_ioctl.h\
+        os/BDBMap.h\
+        os/Fake.h\
+        os/FakeStoreBDBCollections.h\
+        os/FileJournal.h\
+        os/FileStore.h\
+        os/Journal.h\
+        os/JournalingObjectStore.h\
+        os/ObjectStore.h\
+        osbdb/OSBDB.h\
+        osd/Ager.h\
+        osd/OSD.h\
+        osd/OSDCaps.h\
+        osd/OSDMap.h\
+        osd/ObjectVersioner.h\
+        osd/PG.h\
+        osd/PGLS.h\
+        osd/RAID4PG.h\
+        osd/ReplicatedPG.h\
+        osd/osd_types.h\
+	osdc/rados_bencher.h\
+        osdc/Blinker.h\
+        osdc/Filer.h\
+        osdc/Journaler.h\
+        osdc/ObjectCacher.h\
+        osdc/Objecter.h\
+	rgw/rgw_access.h\
+	rgw/rgw_acl.h\
+	rgw/rgw_fs.h\
+	rgw/rgw_rados.h\
+	rgw/rgw_op.h\
+	rgw/rgw_rest.h\
+	rgw/rgw_common.h\
+	rgw/rgw_user.h\
+	sample.ceph.conf
+
+all_sources = $(cmon_SOURCES) $(ceph_SOURCES) $(cauthtool_SOURCES) $(monmaptool_SOURCES) \
+	$(crushtool_SOURCES) $(osdmaptool_SOURCES) $(cconf_SOURCES) $(mount_ceph_SOURCES) $(cmds_SOURCES) \
+	$(dumpjournal_SOURCES) $(cosd_SOURCES) $(dupstore_SOURCES) $(streamtest_SOURCES) $(csyn_SOURCES)  \
+	$(testmsgr_SOURCES) $(cfuse_SOURCES) $(fakefuse_SOURCES) $(psim_SOURCES) \
+	$(libcrush_so_a_SOURCES) $(libcommon_files) $(libcrush_a_SOURCES)  \
+	$(libmon_a_SOURCES) $(libmds_a_SOURCES) $(libos_a_SOURCES) $(libosd_a_SOURCES) \
+	$(libosdc_a_SOURCES) $(libclient_a_SOURCES)
 
=== modified file 'configure'
--- configure	2011-02-25 15:17:26 +0000
+++ configure	2011-03-28 07:08:46 +0000
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
+<<<<<<< TREE
 # Generated by GNU Autoconf 2.61 for Ceph distributed file system 0.24.3.
+=======
+# Generated by GNU Autoconf 2.61 for Ceph distributed file system 0.24.2.
+>>>>>>> MERGE-SOURCE
 #
 # Report bugs to <Sage Weil <[e-mail]>>.
 #
@@ -728,8 +732,13 @@
 # Identity of this package.
 PACKAGE_NAME='Ceph distributed file system'
 PACKAGE_TARNAME='ceph'
+<<<<<<< TREE
 PACKAGE_VERSION='0.24.3'
 PACKAGE_STRING='Ceph distributed file system 0.24.3'
+=======
+PACKAGE_VERSION='0.24.2'
+PACKAGE_STRING='Ceph distributed file system 0.24.2'
+>>>>>>> MERGE-SOURCE
 PACKAGE_BUGREPORT='Sage Weil <[e-mail]>'
 
 # Factoring default headers for most tests.
@@ -1422,7 +1431,11 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
+<<<<<<< TREE
 \`configure' configures Ceph distributed file system 0.24.3 to adapt to many kinds of systems.
+=======
+\`configure' configures Ceph distributed file system 0.24.2 to adapt to many kinds of systems.
+>>>>>>> MERGE-SOURCE
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1506,11 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
+<<<<<<< TREE
      short | recursive ) echo "Configuration of Ceph distributed file system 0.24.3:";;
+=======
+     short | recursive ) echo "Configuration of Ceph distributed file system 0.24.2:";;
+>>>>>>> MERGE-SOURCE
    esac
   cat <<\_ACEOF
 
@@ -1610,7 +1627,11 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+<<<<<<< TREE
 Ceph distributed file system configure 0.24.3
+=======
+Ceph distributed file system configure 0.24.2
+>>>>>>> MERGE-SOURCE
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1624,7 +1645,11 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
+<<<<<<< TREE
 It was created by Ceph distributed file system $as_me 0.24.3, which was
+=======
+It was created by Ceph distributed file system $as_me 0.24.2, which was
+>>>>>>> MERGE-SOURCE
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2444,7 +2469,11 @@
 
 # Define the identity of the package.
  PACKAGE=ceph
+<<<<<<< TREE
  VERSION=0.24.3
+=======
+ VERSION=0.24.2
+>>>>>>> MERGE-SOURCE
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23646,7 +23675,11 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
+<<<<<<< TREE
 This file was extended by Ceph distributed file system $as_me 0.24.3, which was
+=======
+This file was extended by Ceph distributed file system $as_me 0.24.2, which was
+>>>>>>> MERGE-SOURCE
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23699,7 +23732,11 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
+<<<<<<< TREE
 Ceph distributed file system config.status 0.24.3
+=======
+Ceph distributed file system config.status 0.24.2
+>>>>>>> MERGE-SOURCE
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-02-25 15:17:26 +0000
+++ configure.ac	2011-03-28 07:08:46 +0000
@@ -3,7 +3,11 @@
 
 # Autoconf
 AC_PREREQ(2.59)
+<<<<<<< TREE
 AC_INIT([Ceph distributed file system], [0.24.3], 
+=======
+AC_INIT([Ceph distributed file system], [0.24.2], 
+>>>>>>> MERGE-SOURCE
 	      [Sage Weil <[e-mail]>],
 	      [ceph])
 
@@ -12,7 +16,11 @@
 AC_CANONICAL_TARGET
 
 # Automake
+<<<<<<< TREE
 AM_INIT_AUTOMAKE(ceph, 0.24.3)
+=======
+AM_INIT_AUTOMAKE(ceph, 0.24.2)
+>>>>>>> MERGE-SOURCE
 AM_PROG_CC_C_O
 AM_PROG_LIBTOOL
 
 
=== modified file 'debian/ceph.install'
--- debian/ceph.install	2011-02-25 15:17:26 +0000
+++ debian/ceph.install	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 usr/bin/ceph
 usr/bin/cephfs
 usr/bin/cconf
@@ -33,3 +34,43 @@
 usr/share/man/man8/cclsinfo.8
 usr/share/man/man8/cdebugpack.8
 usr/share/ceph_tool/gui_resources/*
+=======
+usr/bin/ceph
+usr/bin/cconf
+usr/bin/cclass
+usr/bin/cclsinfo
+usr/bin/crushtool
+usr/bin/monmaptool
+usr/bin/osdmaptool
+usr/bin/csyn
+usr/bin/crun
+usr/bin/cmon
+usr/bin/cmds
+usr/bin/cosd
+usr/bin/cauthtool
+usr/bin/rados
+usr/bin/rbd
+usr/sbin/mount.ceph sbin/mount.ceph
+usr/sbin/mkcephfs sbin/mkcephfs
+usr/lib/ceph/ceph_common.sh
+usr/lib/rados-classes/*
+usr/share/doc/ceph/sample.ceph.conf
+usr/share/doc/ceph/sample.fetch_config
+usr/share/man/man8/cmon.8
+usr/share/man/man8/cmds.8
+usr/share/man/man8/cosd.8
+usr/share/man/man8/mkcephfs.8
+usr/share/man/man8/crun.8
+usr/share/man/man8/csyn.8
+usr/share/man/man8/crushtool.8
+usr/share/man/man8/osdmaptool.8
+usr/share/man/man8/monmaptool.8
+usr/share/man/man8/cconf.8
+usr/share/man/man8/ceph.8
+usr/share/man/man8/mount.ceph.8
+usr/share/man/man8/cauthtool.8
+usr/share/man/man8/rados.8
+usr/share/man/man8/rbd.8
+usr/share/man/man8/cclass.8
+usr/share/man/man8/cclsinfo.8
+>>>>>>> MERGE-SOURCE
 
=== added file 'debian/ceph.lintian'
--- debian/ceph.lintian	1970-01-01 00:00:00 +0000
+++ debian/ceph.lintian	2011-03-28 07:08:46 +0000
@@ -0,0 +1,4 @@
+#
+# the rados classes should NOT be stripped.
+#
+ceph binary: unstripped-binary-or-object ./usr/lib/rados-classes/libcls_rbd.so.1.0.0
 
=== modified file 'debian/ceph.lintian-overrides'
--- debian/ceph.lintian-overrides	2011-02-25 15:17:26 +0000
+++ debian/ceph.lintian-overrides	2011-03-28 07:08:46 +0000
@@ -1,5 +1,12 @@
+<<<<<<< TREE
 #
 # the rados classes should NOT be stripped.
 #
 ceph: unstripped-binary-or-object usr/lib/rados-classes/libcls_rbd.so.1.0.0
 
+=======
+#
+# the rados classes should NOT be stripped.
+#
+ceph: unstripped-binary-or-object ./usr/lib/rados-classes/libcls_rbd.so.1.0.0
+>>>>>>> MERGE-SOURCE
 
=== added file 'debian/ceph.logrotate'
--- debian/ceph.logrotate	1970-01-01 00:00:00 +0000
+++ debian/ceph.logrotate	2011-03-28 07:08:46 +0000
@@ -0,0 +1,9 @@
+/var/log/ceph/*.log /var/log/ceph/stat/*.log {
+    rotate 7
+    daily
+    compress
+    sharedscripts
+    postrotate
+        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
+    endscript
+}
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-25 15:17:26 +0000
+++ debian/changelog	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ceph (0.24.3-2) unstable; urgency=low
 
   * Make Ceph Linux only and build on all Linux archs (closes: #614890).
@@ -36,3 +37,26 @@
   * Initial release (Closes: #506040)
 
  -- Sage Weil <[e-mail]>  Sun, 21 Nov 2010 15:22:21 -0800
+=======
+ceph (0.24.2-0ubuntu1) natty; urgency=low
+
+  [ Clint Byrum <[e-mail]> ]
+  * New upstream release. (LP: #658670, LP: #684011)
+  * debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
+  * Removed .la files from libceph1-dev, libcrush1-dev and 
+    librados1-dev (per Debian policy v3.9.1 10.2).
+  * debian/control: adding pkg-config as a build dependency
+  * debian/control: depend on libcrypto++-dev instead of libssl-dev
+  * debian/watch: added watch file
+
+  [ Micah Gersten <[e-mail]> ]
+  * debian/control: add Homepage
+
+ -- Clint Byrum <[e-mail]>  Sat, 12 Feb 2011 22:50:26 -0600
+
+ceph (0.21-0ubuntu1) maverick; urgency=low
+
+  * Initial release based on upstream package (LP: #607730)
+
+ -- Clint Byrum <[e-mail]>  Fri, 30 Jul 2010 08:37:32 -0700
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/compat'
--- debian/compat	2011-02-25 15:17:26 +0000
+++ debian/compat	2011-03-28 07:08:46 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 6
+=======
+5
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/control'
--- debian/control	2011-02-25 15:17:26 +0000
+++ debian/control	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Source: ceph
 Section: admin
 Priority: optional
@@ -234,3 +235,215 @@
  service.
  .
  This package contains debugging symbols for radosgw.
+=======
+Source: ceph
+Section: admin
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sage Weil <[e-mail]>
+Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, cdbs, libfuse-dev, libboost-dev, libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, pkg-config
+Standards-Version: 3.9.1
+Homepage: http://ceph.newdream.net/
+
+Package: ceph
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libedit2, hdparm, binutils
+Recommends: ceph-fuse, libceph1, librados1, libcrush1, btrfs-tools
+Description: distributed storage and file system
+ Ceph is a distributed storage and network file system designed to provide
+ excellent performance, reliability, and scalability.
+ .
+ This package contains all server daemons and management tools for creating,
+ running, and administering a Ceph storage cluster.
+
+Package: ceph-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ceph (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for ceph
+ Ceph is a distributed storage and network file system designed to provide
+ excellent performance, reliability, and scalability.
+ .
+ This package contains the debugging symbols for ceph.
+
+Package: ceph-fuse
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse2
+Recommends: fuse-utils
+Suggests: ceph
+Description: FUSE-based client for the Ceph distributed file system
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.  This is a
+ FUSE-based client that allows you to mount a Ceph file system without
+ root privileges.
+ .
+ Because the FUSE-based client has certain inherent performance
+ limitations, it is recommended that the native Linux kernel client
+ be used if possible.  If it is not practical to load a kernel module
+ (insufficient privileges, older kernel, etc.), then the FUSE client will
+ do.
+
+Package: ceph-fuse-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ceph-fuse (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for ceph-fuse
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.  This is a
+ FUSE-based client that allows you to mount a Ceph file system without
+ root privileges.
+ .
+ This package contains the debugging symbols for ceph-fuse.
+
+Package: libcrush1
+Conflicts: libcrush
+Replaces: libcrush
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: CRUSH placement algorithm
+ CRUSH is a pseudo-random hash-like algorithm for mapping inputs to
+ a changing hierarchy of devices without a centralized directory.  It was
+ originally designed for mapping data objects to storage servers, although it
+ may be useful in other domains.  Because large systems are inherently
+ dynamic, CRUSH is designed to facilitate the addition and removal of devices
+ while minimizing unnecessary object movement.  The algorithm accommodates a
+ wide variety of data replication and reliability mechanisms and distributes
+ data in terms of user-defined policies that enforce separation of replicas
+ across failure domains.
+
+Package: libcrush1-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libcrush1 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for libcrush1
+ CRUSH is a pseudo-random hash-like algorithm for mapping inputs to
+ a changing hierarchy of devices without a centralized directory.  It was
+ originally designed for mapping data objects to storage servesr, although it
+ may be useful in other domains.  Because large systems are inherently
+ dynamic, CRUSH is designed to facilitate the addition and removal of devices
+ while minimizing unnecessary object movement.  The algorithm accommodates a
+ wide variety of data replication and reliability mechanisms and distributes
+ data in terms of user-defined policies that enforce separation of replicas
+ across failure domains.
+ .
+ This package contains debugging symbols for libcrush.
+
+Package: libcrush1-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1 (= ${binary:Version})
+Description: CRUSH mapping algorithm (development files)
+ CRUSH is a pseudo-random hash-like algorithm for mapping inputs to
+ a changing hierarchy of devices without a centralized directory.  It was
+ originally designed for mapping data objects to storage servesr, although it
+ may be useful in other domains.  Because large systems are inherently
+ dynamic, CRUSH is designed to facilitate the addition and removal of devices
+ while minimizing unnecessary object movement.  The algorithm accommodates a
+ wide variety of data replication and reliability mechanisms and distributes
+ data in terms of user-defined policies that enforce separation of replicas
+ across failure domains.
+ .
+ This package contains development files needed for building applications that
+ link against libcrush.
+
+Package: librados1
+Conflicts: librados
+Replaces: librados
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1
+Description: RADOS distributed object store client library
+ RADOS is a reliable, autonomic distributed object storage cluster
+ developed as part of the Ceph distributed storage system.  This is a
+ shared library allowing applications to access the distributed object
+ store using a simple file-like interface.
+
+Package: librados1-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: librados1 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for librados1
+ RADOS is a reliable, autonomic distributed object storage cluster
+ developed as part of the Ceph distributed storage system.  This is a
+ shared library allowing applications to access the distributed object
+ store using a simple file-like interface.
+ .
+ This package contains debugging symbols for librados1.
+
+Package: librados1-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, librados1 (= ${binary:Version})
+Description: RADOS distributed object store client library (development files)
+ RADOS is a reliable, autonomic distributed object storage cluster
+ developed as part of the Ceph distributed storage system.  This is a
+ shared library allowing applications to access the distributed object
+ store using a simple file-like interface.
+ .
+ This package contains development files needed for building applications that
+ link against librados.
+
+Package: libceph1
+Conflicts: libceph
+Replaces: libceph
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1
+Description: Ceph distributed file system client library
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.  This is a
+ shared library allowing applications to access a Ceph distributed
+ file system via a POSIX-like interface.
+
+Package: libceph1-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libceph1 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for libceph1
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.  This is a
+ shared library allowing applications to access a Ceph distributed
+ file system via a POSIX-like interface.
+ .
+ This package contains debugging symbols for libceph1.
+
+Package: libceph1-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libceph1 (= ${binary:Version})
+Description: Ceph distributed file system client library (development files)
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.  This is a
+ shared library allowing applications to access a Ceph distributed
+ file system via a POSIX-like interface.
+ .
+ This package contains development files needed for building applications that
+ link against libceph.
+
+Package: radosgw
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libexpat1, librados1
+Description: REST gateway for RADOS distributed object store
+ RADOS is a distributed object store used by the Ceph distributed
+ storage system.  This package provides a REST gateway to the
+ object store that aims to implement a superset of Amazon's S3
+ service.
+ .
+ This package contains the proxy daemon and related tools only.
+
+Package: radosgw-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: radosgw (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for radosgw
+ RADOS is a distributed object store used by the Ceph distributed
+ storage system.  This package provides a REST gateway to the
+ object store that aims to implement a superset of Amazon's S3
+ service.
+ .
+ This package contains debugging symbols for radosgw.
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/copyright'
--- debian/copyright	2011-02-25 15:17:26 +0000
+++ debian/copyright	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: ceph
 Maintainer: Sage Weil <[e-mail]>
@@ -74,3 +75,71 @@
     Copyright (C) 2004-2009 by Sage Weil <[e-mail]>
     Copyright (C) 2010 Canonical, Ltd.
     Licensed under LGPL-2.1
+=======
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: ceph
+Maintainer: Sage Weil <[e-mail]>
+Source: http://ceph.newdream.net/
+
+Files: *
+Copyright: (c) 2004-2010 by Sage Weil <[e-mail]>
+License: LGPL2.1 (see /usr/share/common-licenses/LGPL-2.1)
+
+Files: src/client/fuse.cc
+Copyright: 
+    Copyright (C) 2001-2005  Miklos Szeredi <[e-mail]>
+    Copyright (C) 2004-2006 Sage Weil <[e-mail]>
+License: GPL
+
+Files: src/osbdb/OSBDB.h
+Copyright: Copyright (C) 2007 Casey Marshall <[e-mail]>
+License: LGPL2.1
+
+Files: src/mount/canonicalize.c
+Copyright: Copyright (C) 1993 Rick Sladkey <[e-mail]>
+License: LGPL2 or later
+
+Files: src/os/btrfs_ioctl.h
+Copyright: Copyright (C) 2007 Oracle.  All rights reserved.
+License: GPL2
+
+Files: src/include/ceph_hash.cc
+Copyright: None
+License: Public domain
+
+Files: src/common/sctp_crc32.c: 
+Copyright:
+    Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
+    Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
+License:
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+ 
+  a) Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ 
+  b) Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the distribution.
+ 
+  c) Neither the name of Cisco Systems, Inc. nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+
+Packaging:
+    Copyright (C) 2004-2009 by Sage Weil <[e-mail]>
+    Copyright (C) 2010 Canonical, Ltd.
+    Licensed under LGPL-2.1
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/libceph1-dev.install'
--- debian/libceph1-dev.install	2011-02-25 15:17:26 +0000
+++ debian/libceph1-dev.install	2011-03-28 07:08:46 +0000
@@ -1,4 +1,10 @@
+<<<<<<< TREE
 usr/lib/libceph.so
 usr/lib/libceph.a
 usr/lib/libceph.la
 usr/include/ceph/libceph.h
+=======
+/usr/lib/libceph.so
+/usr/lib/libceph.a
+/usr/include/ceph/libceph.h
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/libceph1.install'
--- debian/libceph1.install	2011-02-25 15:17:26 +0000
+++ debian/libceph1.install	2011-03-28 07:08:46 +0000
@@ -1,2 +1,7 @@
+<<<<<<< TREE
 usr/lib/libceph.so.*
 
+=======
+/usr/lib/libceph.so.*
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/libcrush1-dev.install'
--- debian/libcrush1-dev.install	2011-02-25 15:17:26 +0000
+++ debian/libcrush1-dev.install	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 usr/lib/libcrush.so
 usr/lib/libcrush.a
 usr/lib/libcrush.la
@@ -5,3 +6,11 @@
 usr/include/crush/types.h
 usr/include/crush/mapper.h
 usr/include/crush/crush.h
+=======
+/usr/lib/libcrush.so
+/usr/lib/libcrush.a
+/usr/include/crush/hash.h
+/usr/include/crush/types.h
+/usr/include/crush/mapper.h
+/usr/include/crush/crush.h
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/libcrush1.install'
--- debian/libcrush1.install	2011-02-25 15:17:26 +0000
+++ debian/libcrush1.install	2011-03-28 07:08:46 +0000
@@ -1,2 +1,7 @@
+<<<<<<< TREE
 usr/lib/libcrush.so.*
 
+=======
+/usr/lib/libcrush.so.*
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/librados1-dev.install'
--- debian/librados1-dev.install	2011-02-25 15:17:26 +0000
+++ debian/librados1-dev.install	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 usr/lib/librados.so
 usr/lib/librados.a
 usr/lib/librados.la
@@ -9,3 +10,15 @@
 usr/include/rados/crc32c.h
 usr/include/rados/Spinlock.h
 usr/include/rados/assert.h
+=======
+/usr/lib/librados.so
+/usr/lib/librados.a
+/usr/include/rados/librados.h
+/usr/include/rados/librados.hpp
+/usr/include/rados/buffer.h
+/usr/include/rados/atomic.h
+/usr/include/rados/page.h
+/usr/include/rados/crc32c.h
+/usr/include/rados/Spinlock.h
+/usr/include/rados/assert.h
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/librados1.install'
--- debian/librados1.install	2011-02-25 15:17:26 +0000
+++ debian/librados1.install	2011-03-28 07:08:46 +0000
@@ -1,2 +1,7 @@
+<<<<<<< TREE
 usr/lib/librados.so.*
 
+=======
+/usr/lib/librados.so.*
+
+>>>>>>> MERGE-SOURCE
 
=== added file 'debian/move_dbg_files.sh'
--- debian/move_dbg_files.sh	1970-01-01 00:00:00 +0000
+++ debian/move_dbg_files.sh	2011-03-28 07:08:46 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for f in ceph ceph-fuse libcrush1 librados1 libceph1 radosgw
+do
+    echo moving $f unstripped binaries into $f-dbg
+    mkdir -p debian/$f-dbg/usr/lib
+    mv debian/$f/usr/lib/debug debian/$f-dbg/usr/lib
+done
 
=== added directory 'debian/patches'
=== modified file 'debian/rules'
--- debian/rules	2011-02-25 15:17:26 +0000
+++ debian/rules	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 #!/usr/bin/make -f
 # -*- makefile -*-
 export DH_VERBOSE=1
@@ -86,3 +87,70 @@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
+=======
+#!/usr/bin/make -f
+# -*- makefile -*-
+export DH_VERBOSE=1
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
+build: build-stamp
+build-stamp: configure-stamp  
+	dh_testdir
+
+	./autogen.sh
+	./configure --prefix=/usr
+	$(MAKE)
+	cp src/init-ceph debian/ceph.init
+
+	touch $@
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	test ! -f Makefile || $(MAKE) clean
+
+	dh_clean 
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	$(MAKE) DESTDIR=$(CURDIR) install
+
+
+# Add here commands to install the package into debian/testpack.
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installlogrotate
+	dh_installinit
+	dh_installman
+	dh_lintian
+	dh_link
+
+	dh_strip -k --exclude=libcls_
+	chmod +x debian/move_dbg_files.sh && debian/move_dbg_files.sh
+
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -n  # we do the postinst/postrm scripts manually
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/source/format'
--- debian/source/format	2011-02-25 15:17:26 +0000
+++ debian/source/format	2011-03-28 07:08:46 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 1.0
+=======
+3.0 (quilt)
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/.git_version'
--- src/.git_version	2011-02-25 15:17:26 +0000
+++ src/.git_version	2011-03-28 07:08:46 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 2cd2c56dd07c4862da6a5a8b4c2febafacc37d22
+=======
+f7572de5cb87eb7157217be4975ae66d90831bb7
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/Makefile.am'
=== modified file 'src/Makefile.in'
=== modified file 'src/client/Client.cc'
--- src/client/Client.cc	2011-02-25 15:17:26 +0000
+++ src/client/Client.cc	2011-03-28 07:08:46 +0000
@@ -375,6 +375,7 @@
   }
   if (truncate_seq >= in->truncate_seq &&
       in->truncate_size != truncate_size) {
+<<<<<<< TREE
     if (in->is_file()) {
       dout(10) << "truncate_size " << in->truncate_size << " -> "
 	       << truncate_size << dendl;
@@ -390,6 +391,23 @@
     } else {
       dout(0) << "Hmmm, truncate_seq && truncate_size changed on non-file inode!" << dendl;
     }
+=======
+    if (in->is_file()) {
+      dout(10) << "truncate_size " << in->truncate_size << " -> "
+	       << truncate_size << dendl;
+      in->truncate_size = truncate_size;
+      in->oset.truncate_size = truncate_size;
+      if (g_conf.client_oc && prior_size) { //do actual truncation
+	vector<ObjectExtent> ls;
+	filer->file_to_extents(in->ino, &in->layout,
+			       truncate_size, prior_size - truncate_size,
+			       ls);
+	objectcacher->truncate_set(&in->oset, ls);
+      }
+    } else {
+      dout(0) << "Hmmm, truncate_seq && truncate_size changed on non-file inode!" << dendl;
+    }
+>>>>>>> MERGE-SOURCE
   }
   
   // be careful with size, mtime, atime
 
=== modified file 'src/common/signal.cc'
--- src/common/signal.cc	2011-02-25 15:17:26 +0000
+++ src/common/signal.cc	2011-03-28 07:08:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 /*
@@ -160,3 +161,165 @@
   if (old_sigset)
     sigdelset(old_sigset, SIGKILL);
 }
+=======
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#include "common/BackTrace.h"
+#include "common/Logger.h"
+#include "common/debug.h"
+#include "config.h"
+
+#include <signal.h>
+#include <sstream>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#define dout_prefix *_dout
+#define derr dout(0)
+
+typedef void (*signal_handler_t)(int);
+
+static void install_sighandler(int signum, signal_handler_t handler, int flags)
+{
+  int ret;
+  struct sigaction oldact;
+  struct sigaction act;
+  memset(&act, 0, sizeof(act));
+
+  act.sa_handler = handler;
+  sigemptyset(&act.sa_mask);
+  act.sa_flags = flags;
+
+  ret = sigaction(signum, &act, &oldact);
+  if (ret != 0) {
+    *_dout << "install_sighandler: sigaction returned " << ret << " when "
+         << "trying to install a signal handler for "
+	 << sys_siglist[signum] << "\n";
+    exit(1);
+  }
+}
+
+static void sighup_handler(int signum)
+{
+  // All this does is set a few bits telling us to re-open our logfiles and
+  // restart our central logging service.
+  _dout_need_open = true;
+  logger_reopen_all();
+}
+
+static void handle_fatal_signal(int signum)
+{
+  // This code may itself trigger a SIGSEGV if the heap is corrupt. In that
+  // case, SA_RESETHAND specifies that the default signal handler--
+  // presumably dump core-- will handle it.
+  *_dout << "*** Caught signal (" << sys_siglist[signum] << ") ***"
+	 << std::endl;
+  *_dout << "in thread " << std::hex << pthread_self() << std::endl;
+  BackTrace bt(0);
+  bt.print(*_dout);
+  _dout->flush();
+
+  // Use default handler to dump core
+  int ret = raise(signum);
+
+  // Normally, we won't get here. If we do, something is very weird.
+  if (ret) {
+    *_dout << "handle_fatal_signal: failed to re-raise signal " << signum
+	   << std::endl;
+  }
+  else {
+    *_dout << "handle_fatal_signal: default handler for signal " << signum
+	   << " didn't terminate the process?" << std::endl;
+  }
+  exit(1);
+}
+
+#include <syslog.h>
+
+std::string signal_mask_to_str()
+{
+  sigset_t old_sigset;
+  if (pthread_sigmask(SIG_SETMASK, NULL, &old_sigset)) {
+    return "(pthread_signmask failed)";
+  }
+
+  ostringstream oss;
+  oss << "show_signal_mask: { ";
+  string sep("");
+  for (int signum = 0; signum < NSIG; ++signum) {
+    if (sigismember(&old_sigset, signum) == 1) {
+      oss << sep << signum;
+      sep = ", ";
+    }
+  }
+  oss << " }";
+  return oss.str();
+}
+
+void install_standard_sighandlers(void)
+{
+  install_sighandler(SIGHUP, sighup_handler, SA_RESTART);
+  install_sighandler(SIGSEGV, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGABRT, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGBUS, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGILL, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGFPE, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGXCPU, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGXFSZ, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+  install_sighandler(SIGSYS, handle_fatal_signal, SA_RESETHAND | SA_NODEFER);
+}
+
+void block_all_signals(sigset_t *old_sigset)
+{
+  sigset_t sigset;
+  sigfillset(&sigset);
+  sigdelset(&sigset, SIGKILL);
+  if (pthread_sigmask(SIG_BLOCK, &sigset, old_sigset)) {
+    derr << "block_all_signals: sigprocmask failed" << dendl;
+    if (old_sigset)
+      sigaddset(old_sigset, SIGKILL);
+    return;
+  }
+  if (old_sigset)
+    sigdelset(old_sigset, SIGKILL);
+}
+
+void restore_sigset(const sigset_t *old_sigset)
+{
+  if (sigismember(old_sigset, SIGKILL) != 0) {
+    derr << "restore_sigset: not restoring invalid old_sigset" << dendl;
+    return;
+  }
+  if (pthread_sigmask(SIG_SETMASK, old_sigset, NULL)) {
+    derr << "restore_sigset: sigprocmask failed" << dendl;
+  }
+}
+
+void unblock_all_signals(sigset_t *old_sigset)
+{
+  sigset_t sigset;
+  sigfillset(&sigset);
+  sigdelset(&sigset, SIGKILL);
+  if (pthread_sigmask(SIG_UNBLOCK, &sigset, old_sigset)) {
+    derr << "unblock_all_signals: sigprocmask failed" << dendl;
+    if (old_sigset)
+      sigaddset(old_sigset, SIGKILL);
+    return;
+  }
+  if (old_sigset)
+    sigdelset(old_sigset, SIGKILL);
+}
+>>>>>>> MERGE-SOURCE
 
=== modified file 'src/include/ceph_strings.cc'
--- src/include/ceph_strings.cc	2011-02-25 15:17:26 +0000
+++ src/include/ceph_strings.cc	2011-03-28 07:08:46 +0000
@@ -54,10 +54,16 @@
 	case CEPH_OSD_OP_BALANCEREADS: return "balance-reads";
 	case CEPH_OSD_OP_UNBALANCEREADS: return "unbalance-reads";
 	case CEPH_OSD_OP_SCRUB: return "scrub";
+<<<<<<< TREE
 	case CEPH_OSD_OP_SCRUB_RESERVE: return "scrub-reserve";
 	case CEPH_OSD_OP_SCRUB_UNRESERVE: return "scrub-unreserve";
 	case CEPH_OSD_OP_SCRUB_STOP: return "scrub-stop";
 	case CEPH_OSD_OP_SCRUB_MAP: return "scrub-map";
+=======
+	case CEPH_OSD_OP_SCRUB_RESERVE: return "scrub-reserve";
+	case CEPH_OSD_OP_SCRUB_UNRESERVE: return "scrub-unreserve";
+	case CEPH_OSD_OP_SCRUB_STOP: return "scrub-stop";
+>>>>>>> MERGE-SOURCE
 
 	case CEPH_OSD_OP_WRLOCK: return "wrlock";
 	case CEPH_OSD_OP_WRUNLOCK: return "wrunlock";
 
=== modified file 'src/include/rados.h'
--- src/include/rados.h	2011-02-25 15:17:26 +0000
+++ src/include/rados.h	2011-03-28 07:08:46 +0000
@@ -220,6 +220,7 @@
 	CEPH_OSD_OP_RMXATTR   = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_ATTR | 4,
 
 	/** subop **/
+<<<<<<< TREE
 	CEPH_OSD_OP_PULL            = CEPH_OSD_OP_MODE_SUB | 1,
 	CEPH_OSD_OP_PUSH            = CEPH_OSD_OP_MODE_SUB | 2,
 	CEPH_OSD_OP_BALANCEREADS    = CEPH_OSD_OP_MODE_SUB | 3,
@@ -229,6 +230,16 @@
 	CEPH_OSD_OP_SCRUB_UNRESERVE = CEPH_OSD_OP_MODE_SUB | 7,
 	CEPH_OSD_OP_SCRUB_STOP      = CEPH_OSD_OP_MODE_SUB | 8,
 	CEPH_OSD_OP_SCRUB_MAP     = CEPH_OSD_OP_MODE_SUB | 9,
+=======
+	CEPH_OSD_OP_PULL            = CEPH_OSD_OP_MODE_SUB | 1,
+	CEPH_OSD_OP_PUSH            = CEPH_OSD_OP_MODE_SUB | 2,
+	CEPH_OSD_OP_BALANCEREADS    = CEPH_OSD_OP_MODE_SUB | 3,
+	CEPH_OSD_OP_UNBALANCEREADS  = CEPH_OSD_OP_MODE_SUB | 4,
+	CEPH_OSD_OP_SCRUB           = CEPH_OSD_OP_MODE_SUB | 5,
+	CEPH_OSD_OP_SCRUB_RESERVE   = CEPH_OSD_OP_MODE_SUB | 6,
+	CEPH_OSD_OP_SCRUB_UNRESERVE = CEPH_OSD_OP_MODE_SUB | 7,
+	CEPH_OSD_OP_SCRUB_STOP      = CEPH_OSD_OP_MODE_SUB | 8,
+>>>>>>> MERGE-SOURCE
 
 	/** lock **/
 	CEPH_OSD_OP_WRLOCK    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_LOCK | 1,
 
=== modified file 'src/mds/Locker.cc'
=== modified file 'src/mds/MDS.cc'
--- src/mds/MDS.cc	2011-02-25 15:17:26 +0000
+++ src/mds/MDS.cc	2011-03-28 07:08:46 +0000
@@ -924,10 +924,16 @@
     oldmap->get_mds_set(oldresolve, MDSMap::STATE_RESOLVE);
     mdsmap->get_mds_set(resolve, MDSMap::STATE_RESOLVE);
     if (oldresolve != resolve) {
+<<<<<<< TREE
       dout(10) << " resolve set is " << resolve << ", was " << oldresolve << dendl;
       calc_recovery_set();
       if (!mdsmap->is_any_failed())
 	mdcache->send_resolves();
+=======
+      dout(10) << " resolve set is " << resolve << ", was " << oldresolve << dendl;
+      calc_recovery_set();
+      mdcache->send_resolves();
+>>>>>>> MERGE-SOURCE
     }
   }
   
 
=== modified file 'src/mds/MDSMap.h'
=== modified file 'src/mon/MDSMonitor.cc'
--- src/mon/MDSMonitor.cc	2011-02-25 15:17:26 +0000
+++ src/mon/MDSMonitor.cc	2011-03-28 07:08:46 +0000
@@ -182,6 +182,7 @@
 	   << " " << m->get_compat()
 	   << dendl;
 
+<<<<<<< TREE
   // make sure the address has a port
   if (m->get_orig_source_addr().get_port() == 0) {
     dout(1) << " ignoring boot message without a port" << dendl;
@@ -194,6 +195,14 @@
     goto out;
   }
 
+=======
+  // check compat
+  if (!m->get_compat().writeable(mdsmap.compat)) {
+    dout(1) << " mds " << m->get_source_inst() << " can't write to mdsmap " << mdsmap.compat << dendl;
+    goto out;
+  }
+
+>>>>>>> MERGE-SOURCE
   // fw to leader?
   if (!mon->is_leader())
     return false;
 
=== modified file 'src/mount/mount.ceph.c'
=== modified file 'src/msg/Message.cc'
--- src/msg/Message.cc	2011-02-25 15:17:26 +0000
+++ src/msg/Message.cc	2011-03-28 07:08:46 +0000
@@ -315,12 +315,18 @@
   case MSG_REMOVE_SNAPS:
     m = new MRemoveSnaps;
     break;
+<<<<<<< TREE
   case MSG_OSD_PG_MISSING:
     m = new MOSDPGMissing;
     break;
   case MSG_OSD_REP_SCRUB:
     m = new MOSDRepScrub;
     break;
+=======
+  case MSG_OSD_PG_MISSING:
+    m = new MOSDPGMissing;
+    break;
+>>>>>>> MERGE-SOURCE
    // auth
   case CEPH_MSG_AUTH:
     m = new MAuth;
 
=== modified file 'src/msg/Message.h'
--- src/msg/Message.h	2011-02-25 15:17:26 +0000
+++ src/msg/Message.h	2011-03-28 07:08:46 +0000
@@ -73,8 +73,12 @@
 #define MSG_REMOVE_SNAPS       90
 
 #define MSG_OSD_SCRUB          91
+<<<<<<< TREE
 #define MSG_OSD_PG_MISSING     92
 #define MSG_OSD_REP_SCRUB      93
+=======
+#define MSG_OSD_PG_MISSING     92
+>>>>>>> MERGE-SOURCE
 
 
 
 
=== modified file 'src/os/FileStore.cc'
--- src/os/FileStore.cc	2011-02-25 15:17:26 +0000
+++ src/os/FileStore.cc	2011-03-28 07:08:46 +0000
@@ -1048,6 +1048,7 @@
       dout(0) << "mount WARNING: not btrfs, store may be in inconsistent state" << dendl;
     } else {
       uint64_t cp = snaps.back();
+<<<<<<< TREE
       uint64_t curr_seq;
 
       int curr_fd = read_op_seq(current_op_seq_fn, &curr_seq);
@@ -1079,6 +1080,38 @@
         cerr << TEXT_YELLOW
 	     << " ** WARNING: forcing the use of stale snapshot data\n" << TEXT_NORMAL;
       }
+=======
+      uint64_t curr_seq;
+
+      int curr_fd = read_op_seq(current_op_seq_fn, &curr_seq);
+      assert(curr_fd >= 0);
+      close(curr_fd);
+      dout(10) << "*** curr_seq=" << curr_seq << " cp=" << cp << dendl;
+     
+      if (cp != curr_seq && !g_conf.osd_use_stale_snap) { 
+        dout(0) << "\n"
+             << " ** ERROR: current volume data version is not equal to snapshotted version\n"
+	     << "           which can lead to data inconsistency. \n"
+	     << "           Current version=" << curr_seq << " snapshot version=" << cp << "\n"
+	     << "           Startup with snapshotted version can be forced using the\n"
+             <<"            'osd use stale snap = true' config option.\n"
+	     << dendl;
+        cerr << TEXT_RED
+	     << " ** ERROR: current volume data version is not equal to snapshotted version\n"
+	     << "           which can lead to data inconsistency. \n"
+	     << "           Current version=" << curr_seq << " snapshot version=" << cp << "\n"
+	     << "           Startup with snapshotted version can be forced using the\n"
+             <<"            'osd use stale snap = true' config option.\n"
+	     << TEXT_NORMAL;
+        exit(1);
+      }
+
+      if (cp != curr_seq) {
+        dout(0) << "WARNING: user forced start with data sequence mismatch: curr=" << curr_seq << " snap_seq=" << cp << dendl;
+        cerr << TEXT_YELLOW
+	     << " ** WARNING: forcing the use of stale snapshot data\n" << TEXT_NORMAL;
+      }
+>>>>>>> MERGE-SOURCE
 
       // drop current
       btrfs_ioctl_vol_args vol_args;
@@ -1109,6 +1142,7 @@
       ::close(vol_args.fd);
       dout(10) << "mount rolled back to consistent snap " << cp << dendl;
       snaps.pop_back();
+<<<<<<< TREE
 
       if (cp != curr_seq) {
         curr_fd = read_op_seq(current_op_seq_fn, &curr_seq);
@@ -1117,6 +1151,17 @@
         write_op_seq(curr_fd, curr_seq);
 	::close(curr_fd);
       }
+=======
+
+      assert(curr_fd >= 0);
+      if (cp != curr_seq) {
+        curr_fd = read_op_seq(current_op_seq_fn, &curr_seq);
+        /* we'll use the higher version from now on */
+        curr_seq = cp;
+        write_op_seq(curr_fd, curr_seq);
+      }
+      close(curr_fd);
+>>>>>>> MERGE-SOURCE
     }
   }
 
 
=== modified file 'src/osd/OSD.cc'
--- src/osd/OSD.cc	2011-02-25 15:17:26 +0000
+++ src/osd/OSD.cc	2011-03-28 07:08:46 +0000
@@ -2056,6 +2056,7 @@
 {
   // lock!
   osd_lock.Lock();
+<<<<<<< TREE
   while (dispatch_running) {
     dout(10) << "ms_dispatch waiting for other dispatch thread to complete" << dendl;
     dispatch_cond.Wait(osd_lock);
@@ -2063,7 +2064,11 @@
   dispatch_running = true;
 
   do_waiters();
+=======
+  ++dispatch_running;
+>>>>>>> MERGE-SOURCE
   _dispatch(m);
+<<<<<<< TREE
   do_waiters();
 
   dispatch_running = false;
@@ -2071,6 +2076,10 @@
   // no need to signal here, since tick() doesn't wait.
   //dispatch_cond.Signal();
 
+=======
+  --dispatch_running;
+  do_waiters();
+>>>>>>> MERGE-SOURCE
   osd_lock.Unlock();
   return true;
 }
@@ -2279,6 +2288,7 @@
       }
     }
   }
+<<<<<<< TREE
 
   logger->set(l_osd_buf, buffer_total_alloc.read());
 
@@ -2289,6 +2299,13 @@
   dout(10) << "queueing MOSDRepScrub " << *m << dendl;
   rep_scrub_wq.queue(m);
 }
+=======
+
+  logger->set(l_osd_buf, buffer_total_alloc.read());
+
+}
+
+>>>>>>> MERGE-SOURCE
 
 void OSD::handle_scrub(MOSDScrub *m)
 {
@@ -2769,9 +2786,14 @@
       pg->write_info(t);
   }
 
+<<<<<<< TREE
   bool do_shutdown = false;
   bool do_restart = false;
+=======
+  bool do_shutdown = false;
+>>>>>>> MERGE-SOURCE
   if (osdmap->get_epoch() > 0 &&
+<<<<<<< TREE
       state == STATE_ACTIVE) {
     if (!osdmap->exists(whoami)) {
       dout(0) << "map says i do not exist.  shutting down." << dendl;
@@ -2812,6 +2834,34 @@
 
       reset_heartbeat_peers();
     }
+=======
+      state == STATE_ACTIVE) {
+    if (!osdmap->exists(whoami)) {
+      dout(0) << "map says i do not exist.  shutting down." << dendl;
+      do_shutdown = true;   // don't call shutdown() while we have everything paused
+    } else if (!osdmap->is_up(whoami) ||
+	       osdmap->get_addr(whoami) != client_messenger->get_myaddr()) {
+      stringstream ss;
+      ss << "map e" << osdmap->get_epoch() << " wrongly marked me down";
+      logclient.log(LOG_WARN, ss);
+      
+      state = STATE_BOOTING;
+      up_epoch = 0;
+
+      int cport = cluster_messenger->get_myaddr().get_port();
+      int hbport = heartbeat_messenger->get_myaddr().get_port();
+
+      int r = cluster_messenger->rebind(hbport);
+      if (r != 0)
+	do_shutdown = true;  // FIXME: do_restart?
+
+      r = heartbeat_messenger->rebind(cport);
+      if (r != 0)
+	do_shutdown = true;  // FIXME: do_restart?
+
+      reset_heartbeat_peers();
+    }
+>>>>>>> MERGE-SOURCE
   }
 
   // note in the superblock that we were clean thru the prior epoch
 
=== modified file 'src/osd/OSD.h'
--- src/osd/OSD.h	2011-02-25 15:17:26 +0000
+++ src/osd/OSD.h	2011-03-28 07:08:46 +0000
@@ -133,8 +133,12 @@
     }
   };
 
+<<<<<<< TREE
   Cond dispatch_cond;
   int dispatch_running;
+=======
+  int dispatch_running;
+>>>>>>> MERGE-SOURCE
 
   void open_logger();
   void start_logger();
 
=== modified file 'src/osd/PG.cc'
--- src/osd/PG.cc	2011-02-25 15:17:26 +0000
+++ src/osd/PG.cc	2011-03-28 07:08:46 +0000
@@ -2742,70 +2742,175 @@
 // ==========================================================================================
 // SCRUB
 
-/*
- * when holding pg and sched_scrub_lock, then the states are:
- *   scheduling:
- *     scrub_reserved = true
- *     scrub_rserved_peers includes whoami
- *     osd->scrub_pending++
- *   scheduling, replica declined:
- *     scrub_reserved = true
- *     scrub_reserved_peers includes -1
- *     osd->scrub_pending++
- *   pending:
- *     scrub_reserved = true
- *     scrub_reserved_peers.size() == acting.size();
- *     pg on scrub_wq
- *     osd->scrub_pending++
- *   scrubbing:
- *     scrub_reserved = false;
- *     scrub_reserved_peers empty
- *     osd->scrub_active++
- */
-
-// returns false if waiting for a reply
-bool PG::sched_scrub()
-{
-  assert(_lock.is_locked());
-  if (!(is_primary() && is_active() && is_clean() && !is_scrubbing())) {
-    return true;
-  }
-
-  // just scrubbed?
-  if (info.history.last_scrub_stamp + g_conf.osd_scrub_min_interval > g_clock.now()) {
-    dout(20) << "sched_scrub: just scrubbed, skipping" << dendl;
-    return true;
-  }
-
-  bool ret = false;
-  if (!scrub_reserved) {
-    assert(scrub_reserved_peers.empty());
-    if (osd->inc_scrubs_pending()) {
-      dout(20) << "sched_scrub: reserved locally, reserving replicas" << dendl;
-      scrub_reserved = true;
-      scrub_reserved_peers.insert(osd->whoami);
-      scrub_reserve_replicas();
-    } else {
-      dout(20) << "sched_scrub: failed to reserve locally" << dendl;
-    }
-  }
-  if (scrub_reserved) {
-    if (scrub_reserve_failed) {
-      dout(20) << "sched_scrub: failed, a peer declined" << dendl;
-      clear_scrub_reserved();
-      scrub_unreserve_replicas();
-      ret = true;
-    } else if (scrub_reserved_peers.size() == acting.size()) {
-      dout(20) << "sched_scrub: success, reserved self and replicas" << dendl;
-      osd->scrub_wq.queue(this);
-      ret = true;
-    } else {
-      // none declined, since scrub_reserved is set
-      dout(20) << "sched_scrub: reserved " << scrub_reserved_peers << ", waiting for replicas" << dendl;
-    }
-  }
-
-  return ret;
+<<<<<<< TREE
+/*
+ * when holding pg and sched_scrub_lock, then the states are:
+ *   scheduling:
+ *     scrub_reserved = true
+ *     scrub_rserved_peers includes whoami
+ *     osd->scrub_pending++
+ *   scheduling, replica declined:
+ *     scrub_reserved = true
+ *     scrub_reserved_peers includes -1
+ *     osd->scrub_pending++
+ *   pending:
+ *     scrub_reserved = true
+ *     scrub_reserved_peers.size() == acting.size();
+ *     pg on scrub_wq
+ *     osd->scrub_pending++
+ *   scrubbing:
+ *     scrub_reserved = false;
+ *     scrub_reserved_peers empty
+ *     osd->scrub_active++
+ */
+
+// returns false if waiting for a reply
+bool PG::sched_scrub()
+=======
+/*
+ * when holding pg and sched_scrub_lock, then the states are:
+ *   scheduling:
+ *     scrub_reserved = true
+ *     scrub_rserved_peers includes whoami
+ *     osd->scrub_pending++
+ *   scheduling, replica declined:
+ *     scrub_reserved = true
+ *     scrub_reserved_peers includes -1
+ *     osd->scrub_pending++
+ *   pending:
+ *     scrub_reserved = true
+ *     scrub_reserved_peers.size() == acting.size();
+ *     pg on scrub_wq
+ *     osd->scrub_pending++
+ *   scrubbing:
+ *     scrub_reserved = false;
+ *     scrub_reserved_peers empty
+ *     osd->scrub_active++
+ */
+
+// returns false if waiting for a reply
+bool PG::sched_scrub()
+{
+  assert(_lock.is_locked());
+  if (!(is_primary() && is_active() && is_clean() && !is_scrubbing())) {
+    return true;
+  }
+
+  // just scrubbed?
+  if (info.history.last_scrub_stamp + g_conf.osd_scrub_min_interval > g_clock.now()) {
+    dout(20) << "sched_scrub: just scrubbed, skipping" << dendl;
+    return true;
+  }
+
+  bool ret = false;
+  if (!scrub_reserved) {
+    assert(scrub_reserved_peers.empty());
+    if (osd->inc_scrubs_pending()) {
+      dout(20) << "sched_scrub: reserved locally, reserving replicas" << dendl;
+      scrub_reserved = true;
+      scrub_reserved_peers.insert(osd->whoami);
+      scrub_reserve_replicas();
+    } else {
+      dout(20) << "sched_scrub: failed to reserve locally" << dendl;
+    }
+  }
+  if (scrub_reserved) {
+    if (scrub_reserve_failed) {
+      dout(20) << "sched_scrub: failed, a peer declined" << dendl;
+      clear_scrub_reserved();
+      scrub_unreserve_replicas();
+      ret = true;
+    } else if (scrub_reserved_peers.size() == acting.size()) {
+      dout(20) << "sched_scrub: success, reserved self and replicas" << dendl;
+      osd->scrub_wq.queue(this);
+      ret = true;
+    } else {
+      // none declined, since scrub_reserved is set
+      dout(20) << "sched_scrub: reserved " << scrub_reserved_peers << ", waiting for replicas" << dendl;
+    }
+  }
+
+  return ret;
+}
+
+void PG::sub_op_scrub(MOSDSubOp *op)
+>>>>>>> MERGE-SOURCE
+{
+<<<<<<< TREE
+  assert(_lock.is_locked());
+  if (!(is_primary() && is_active() && is_clean() && !is_scrubbing())) {
+    return true;
+  }
+
+  // just scrubbed?
+  if (info.history.last_scrub_stamp + g_conf.osd_scrub_min_interval > g_clock.now()) {
+    dout(20) << "sched_scrub: just scrubbed, skipping" << dendl;
+    return true;
+  }
+
+  bool ret = false;
+  if (!scrub_reserved) {
+    assert(scrub_reserved_peers.empty());
+    if (osd->inc_scrubs_pending()) {
+      dout(20) << "sched_scrub: reserved locally, reserving replicas" << dendl;
+      scrub_reserved = true;
+      scrub_reserved_peers.insert(osd->whoami);
+      scrub_reserve_replicas();
+    } else {
+      dout(20) << "sched_scrub: failed to reserve locally" << dendl;
+    }
+  }
+  if (scrub_reserved) {
+    if (scrub_reserve_failed) {
+      dout(20) << "sched_scrub: failed, a peer declined" << dendl;
+      clear_scrub_reserved();
+      scrub_unreserve_replicas();
+      ret = true;
+    } else if (scrub_reserved_peers.size() == acting.size()) {
+      dout(20) << "sched_scrub: success, reserved self and replicas" << dendl;
+      osd->scrub_wq.queue(this);
+      ret = true;
+    } else {
+      // none declined, since scrub_reserved is set
+      dout(20) << "sched_scrub: reserved " << scrub_reserved_peers << ", waiting for replicas" << dendl;
+    }
+  }
+
+  return ret;
+=======
+  dout(7) << "sub_op_scrub" << dendl;
+
+  if (op->map_epoch < info.history.same_acting_since) {
+    dout(10) << "sub_op_scrub discarding old sub_op from "
+	     << op->map_epoch << " < " << info.history.same_acting_since << dendl;
+    op->put();
+    return;
+  }
+
+  ScrubMap map;
+  if (op->version > eversion_t()) {
+    epoch_t epoch = info.history.same_acting_since;
+    finalizing_scrub = 1;
+    while (last_update_applied != info.last_update) {
+      wait();
+      if (epoch != info.history.same_acting_since ||
+	  osd->is_stopping()) {
+	dout(10) << "scrub  pg changed, aborting" << dendl;
+	return;
+      }
+    }
+    build_inc_scrub_map(map, op->version);
+    finalizing_scrub = 0;
+  } else {
+    build_scrub_map(map);
+  }
+
+  MOSDSubOpReply *reply = new MOSDSubOpReply(op, 0, osd->osdmap->get_epoch(), CEPH_OSD_FLAG_ACK); 
+  ::encode(map, reply->get_data());
+  osd->cluster_messenger->send_message(reply, op->get_connection());
+
+  op->put();
+>>>>>>> MERGE-SOURCE
 }
 
 
@@ -2834,6 +2939,7 @@
   op->put();
 }
 
+<<<<<<< TREE
 /* 
  * pg lock may or may not be held
  */
@@ -2984,6 +3090,164 @@
     osd->cluster_messenger->send_message(subop, osd->osdmap->get_cluster_inst(acting[i]));
   }
 }
+=======
+/* 
+ * pg lock may or may not be held
+ */
+void PG::_scan_list(ScrubMap &map, vector<sobject_t> &ls)
+{
+  dout(10) << "_scan_list scanning " << ls.size() << " objects" << dendl;
+  int i = 0;
+  for (vector<sobject_t>::iterator p = ls.begin(); 
+       p != ls.end(); 
+       p++, i++) {
+    sobject_t poid = *p;
+
+    struct stat st;
+    int r = osd->store->stat(coll, poid, &st);
+    if (r == 0) {
+      ScrubMap::object &o = map.objects[poid];
+      o.size = st.st_size;
+      osd->store->getattrs(coll, poid, o.attrs);
+      dout(25) << "_scan_list  " << poid << dendl;
+    } else {
+      dout(25) << "_scan_list  " << poid << " got " << r << ", skipping" << dendl;
+    }
+  }
+}
+
+void PG::_request_scrub_map(int replica, eversion_t version)
+{
+    dout(10) << "scrub  requesting scrubmap from osd" << replica << dendl;
+    vector<OSDOp> scrub(1);
+    scrub[0].op.op = CEPH_OSD_OP_SCRUB;
+    sobject_t poid;
+    eversion_t v = version;
+    osd_reqid_t reqid;
+    MOSDSubOp *subop = new MOSDSubOp(reqid, info.pgid, poid, false, 0,
+				     osd->osdmap->get_epoch(), osd->get_tid(), v);
+    subop->ops = scrub;
+    osd->cluster_messenger->send_message(subop, //new MOSDPGScrub(info.pgid, osd->osdmap->get_epoch()),
+					 osd->osdmap->get_cluster_inst(replica));
+}
+
+void PG::sub_op_scrub_reserve(MOSDSubOp *op)
+{
+  dout(7) << "sub_op_scrub_reserve" << dendl;
+
+  if (scrub_reserved) {
+    dout(10) << "Ignoring reserve request: Already reserved" << dendl;
+    op->put();
+    return;
+  }
+
+  scrub_reserved = osd->inc_scrubs_pending();
+
+  MOSDSubOpReply *reply = new MOSDSubOpReply(op, 0, osd->osdmap->get_epoch(), CEPH_OSD_FLAG_ACK);
+  ::encode(scrub_reserved, reply->get_data());
+  osd->cluster_messenger->send_message(reply, op->get_connection());
+
+  op->put();
+}
+
+void PG::sub_op_scrub_reserve_reply(MOSDSubOpReply *op)
+{
+  dout(7) << "sub_op_scrub_reserve_reply" << dendl;
+
+  if (!scrub_reserved) {
+    dout(10) << "ignoring obsolete scrub reserve reply" << dendl;
+    op->put();
+    return;
+  }
+
+  int from = op->get_source().num();
+  bufferlist::iterator p = op->get_data().begin();
+  bool reserved;
+  ::decode(reserved, p);
+
+  if (scrub_reserved_peers.find(from) != scrub_reserved_peers.end()) {
+    dout(10) << " already had osd" << from << " reserved" << dendl;
+  } else {
+    if (reserved) {
+      dout(10) << " osd" << from << " scrub reserve = success" << dendl;
+      scrub_reserved_peers.insert(from);
+    } else {
+      /* One decline stops this pg from being scheduled for scrubbing. */
+      dout(10) << " osd" << from << " scrub reserve = fail" << dendl;
+      scrub_reserve_failed = true;
+    }
+    sched_scrub();
+  }
+
+  op->put();
+}
+
+void PG::sub_op_scrub_unreserve(MOSDSubOp *op)
+{
+  dout(7) << "sub_op_scrub_unreserve" << dendl;
+
+  clear_scrub_reserved();
+
+  op->put();
+}
+
+void PG::sub_op_scrub_stop(MOSDSubOp *op)
+{
+  dout(7) << "sub_op_scrub_stop" << dendl;
+
+  // see comment in sub_op_scrub_reserve
+  scrub_reserved = false;
+
+  MOSDSubOpReply *reply = new MOSDSubOpReply(op, 0, osd->osdmap->get_epoch(), CEPH_OSD_FLAG_ACK); 
+  osd->cluster_messenger->send_message(reply, op->get_connection());
+
+  op->put();
+}
+
+void PG::clear_scrub_reserved()
+{
+  osd->scrub_wq.dequeue(this);
+  scrub_reserved_peers.clear();
+  scrub_reserve_failed = false;
+
+  if (scrub_reserved) {
+    scrub_reserved = false;
+    osd->dec_scrubs_pending();
+  }
+}
+
+void PG::scrub_reserve_replicas()
+{
+  for (unsigned i=1; i<acting.size(); i++) {
+    dout(10) << "scrub requesting reserve from osd" << acting[i] << dendl;
+    vector<OSDOp> scrub(1);
+    scrub[0].op.op = CEPH_OSD_OP_SCRUB_RESERVE;
+    sobject_t poid;
+    eversion_t v;
+    osd_reqid_t reqid;
+    MOSDSubOp *subop = new MOSDSubOp(reqid, info.pgid, poid, false, 0,
+                                     osd->osdmap->get_epoch(), osd->get_tid(), v);
+    subop->ops = scrub;
+    osd->cluster_messenger->send_message(subop, osd->osdmap->get_cluster_inst(acting[i]));
+  }
+}
+
+void PG::scrub_unreserve_replicas()
+{
+  for (unsigned i=1; i<acting.size(); i++) {
+    dout(10) << "scrub requesting unreserve from osd" << acting[i] << dendl;
+    vector<OSDOp> scrub(1);
+    scrub[0].op.op = CEPH_OSD_OP_SCRUB_UNRESERVE;
+    sobject_t poid;
+    eversion_t v;
+    osd_reqid_t reqid;
+    MOSDSubOp *subop = new MOSDSubOp(reqid, info.pgid, poid, false, 0,
+                                     osd->osdmap->get_epoch(), osd->get_tid(), v);
+    subop->ops = scrub;
+    osd->cluster_messenger->send_message(subop, osd->osdmap->get_cluster_inst(acting[i]));
+  }
+}
+>>>>>>> MERGE-SOURCE
 
 /*
  * build a (sorted) summary of pg content for purposes of scrubbing
 
=== modified file 'src/osd/PG.h'
--- src/osd/PG.h	2011-02-25 15:17:26 +0000
+++ src/osd/PG.h	2011-03-28 07:08:46 +0000
@@ -904,6 +904,7 @@
   void build_scrub_map(ScrubMap &map);
   void build_inc_scrub_map(ScrubMap &map, eversion_t v);
   virtual int _scrub(ScrubMap &map, int& errors, int& fixed) { return 0; }
+<<<<<<< TREE
   void clear_scrub_reserved();
   void scrub_reserve_replicas();
   void scrub_unreserve_replicas();
@@ -916,6 +917,20 @@
   void sub_op_scrub_reserve_reply(class MOSDSubOpReply *op);
   void sub_op_scrub_unreserve(class MOSDSubOp *op);
   void sub_op_scrub_stop(class MOSDSubOp *op);
+=======
+  void clear_scrub_reserved();
+  void scrub_reserve_replicas();
+  void scrub_unreserve_replicas();
+  bool scrub_all_replicas_reserved() const;
+  bool sched_scrub();
+
+  void sub_op_scrub(class MOSDSubOp *op);
+  void sub_op_scrub_reply(class MOSDSubOpReply *op);
+  void sub_op_scrub_reserve(class MOSDSubOp *op);
+  void sub_op_scrub_reserve_reply(class MOSDSubOpReply *op);
+  void sub_op_scrub_unreserve(class MOSDSubOp *op);
+  void sub_op_scrub_stop(class MOSDSubOp *op);
+>>>>>>> MERGE-SOURCE
 
  public:  
   PG(OSD *o, PGPool *_pool, pg_t p, const sobject_t& loid, const sobject_t& ioid) : 
 
=== modified file 'src/osd/ReplicatedPG.cc'
--- src/osd/ReplicatedPG.cc	2011-02-25 15:17:26 +0000
+++ src/osd/ReplicatedPG.cc	2011-03-28 07:08:46 +0000
@@ -493,6 +493,15 @@
     case CEPH_OSD_OP_SCRUB_MAP:
       sub_op_scrub_map(op);
       return;
+    case CEPH_OSD_OP_SCRUB_RESERVE:
+      sub_op_scrub_reserve(op);
+      return;
+    case CEPH_OSD_OP_SCRUB_UNRESERVE:
+      sub_op_scrub_unreserve(op);
+      return;
+    case CEPH_OSD_OP_SCRUB_STOP:
+      sub_op_scrub_stop(op);
+      return;
     }
   }
 
@@ -508,6 +517,16 @@
       // continue peer recovery
       sub_op_push_reply(r);
       return;
+<<<<<<< TREE
+
+    case CEPH_OSD_OP_SCRUB_RESERVE:
+      sub_op_scrub_reserve_reply(r);
+=======
+
+    case CEPH_OSD_OP_SCRUB:
+      sub_op_scrub_reply(r);
+>>>>>>> MERGE-SOURCE
+      return;
 
     case CEPH_OSD_OP_SCRUB_RESERVE:
       sub_op_scrub_reserve_reply(r);
@@ -521,6 +540,7 @@
 
 bool ReplicatedPG::snap_trimmer()
 {
+  assert(is_primary() && is_clean());
   lock();
   if (!(is_primary() && is_clean() && is_active())) {
     unlock();
@@ -1654,8 +1674,14 @@
       assert(0);
     }
   } else { //we got our context, let's use it to do the rollback!
+<<<<<<< TREE
     sobject_t& rollback_to_sobject = rollback_to->obs.oi.soid;
     if (ctx->clone_obc && *ctx->clone_obc->obs.oi.snaps.rbegin() <= snapid) {
+=======
+    sobject_t& rollback_to_sobject = rollback_to->obs.oi.soid;
+    if (ctx->clone_obc &&
+	(ctx->clone_obc->obs.oi.soid.snap == snapid)) {
+>>>>>>> MERGE-SOURCE
       //just cloned the rollback target, we don't need to do anything!
     } else {
       /* 1) Delete current head