]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge commit 'origin/unstable' into snap
authorSage Weil <sage@newdream.net>
Wed, 6 Aug 2008 18:33:56 +0000 (11:33 -0700)
committerSage Weil <sage@newdream.net>
Wed, 6 Aug 2008 18:33:56 +0000 (11:33 -0700)
commitea422a610f5fea8a1915903c299417d95f75dfac
tree568a5fe111f377dfc25300b8f4fe6f8ae0224cf6
parent59405cbd8571f540623700b73e4f6e4d0c315ebb
parent689a8d283908e6700966a50ead74e09f7cb7e987
Merge commit 'origin/unstable' into snap

Conflicts:

src/osd/OSDMap.cc
src/osd/ReplicatedPG.cc
19 files changed:
src/TODO
src/client/Client.cc
src/client/SyntheticClient.cc
src/config.cc
src/config.h
src/ebofs/Ebofs.cc
src/ebofs/Ebofs.h
src/include/object.h
src/mds/LogEvent.cc
src/mds/journal.cc
src/os/Fake.h
src/os/FileStore.cc
src/os/FileStore.h
src/os/ObjectStore.h
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/ReplicatedPG.cc
src/vstartnew.sh