]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'inclock1' into unstable
authorSage Weil <sage@newdream.net>
Tue, 1 Apr 2008 22:42:14 +0000 (15:42 -0700)
committerSage Weil <sage@newdream.net>
Tue, 1 Apr 2008 22:42:14 +0000 (15:42 -0700)
commitd17eba20a6ba5bfcd4365015b3625619f0dd7d06
tree378fbee88b40859ab1023d5d054b48cccd29a8c0
parent5d315111240460f14f2b4f591c877ddab531cc98
parent18ac05dff865e40a70ac918de207d69060773279
Merge branch 'inclock1' into unstable

Conflicts:

src/TODO
src/client/FileCache.cc
src/kernel/mdsmap.h
src/osdc/Filer.h
src/osdc/ObjectCacher.h
15 files changed:
src/Makefile.am
src/TODO
src/client/Client.cc
src/client/FileCache.cc
src/client/SyntheticClient.cc
src/include/ceph_fs.h
src/kernel/mdsmap.c
src/kernel/mdsmap.h
src/kernel/osd_client.c
src/kernel/osdmap.c
src/mds/MDCache.cc
src/mds/MDS.cc
src/osdc/Filer.cc
src/osdc/Filer.h
src/osdc/ObjectCacher.h