]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'unstable' into snap
authorSage Weil <sage@newdream.net>
Wed, 9 Jul 2008 23:16:48 +0000 (16:16 -0700)
committerSage Weil <sage@newdream.net>
Wed, 9 Jul 2008 23:16:48 +0000 (16:16 -0700)
commitc0b46e03b49ceede770ea1516e48348e1d83be1c
tree9296389af53aa3ddc6bd258f10ea7d5df7b9b822
parent1e98f3e585b6df08518f367964d4992764976484
parentdccae6d2cdff13f6a1ce545fde2623222222979a
Merge branch 'unstable' into snap

Conflicts:

src/TODO
src/messages/MOSDOp.h
src/messages/MOSDSubOp.h
src/vstartnew.sh
22 files changed:
src/TODO
src/client/Client.cc
src/client/SyntheticClient.cc
src/config.cc
src/include/ceph_fs.h
src/mds/CDentry.h
src/mds/CDir.cc
src/mds/CInode.h
src/mds/Locker.cc
src/mds/LogEvent.h
src/mds/LogSegment.h
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/MDS.cc
src/mds/Server.cc
src/messages/MOSDOp.h
src/messages/MOSDSubOp.h
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc
src/osdc/ObjectCacher.h
src/osdc/Objecter.cc