]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
merged trunk changes r1171:1207 into branches/sage/cephmds2 (take 2, worked better...
authorsageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Mon, 12 Mar 2007 03:13:33 +0000 (03:13 +0000)
committersageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Mon, 12 Mar 2007 03:13:33 +0000 (03:13 +0000)
commitc728d594fffa28d7c885863033f1c67f24fc1c92
tree5ef6b72a7f02e15d19dd62d4a269548f595e7037
parentdc8f0e05a9fcf7d27742aa91aeea24a8f7ce5553
merged trunk changes r1171:1207 into branches/sage/cephmds2 (take 2, worked better this time.)

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1210 29311d96-e01e-0410-9327-a35deaab8ce9
31 files changed:
branches/sage/cephmds2/Makefile
branches/sage/cephmds2/cfuse.cc
branches/sage/cephmds2/client/Client.cc
branches/sage/cephmds2/client/FileCache.cc
branches/sage/cephmds2/client/FileCache.h
branches/sage/cephmds2/client/fuse.cc
branches/sage/cephmds2/common/Logger.cc
branches/sage/cephmds2/common/Thread.h
branches/sage/cephmds2/common/Timer.cc
branches/sage/cephmds2/config.cc
branches/sage/cephmds2/config.h
branches/sage/cephmds2/ebofs/BlockDevice.h
branches/sage/cephmds2/ebofs/Table.h
branches/sage/cephmds2/fakefuse.cc
branches/sage/cephmds2/fakesyn.cc
branches/sage/cephmds2/include/Context.h
branches/sage/cephmds2/jobs/example [new file with mode: 0644]
branches/sage/cephmds2/mds/MDS.cc
branches/sage/cephmds2/messages/MOSDOp.h
branches/sage/cephmds2/mon/MonitorStore.cc
branches/sage/cephmds2/mon/OSDMonitor.cc
branches/sage/cephmds2/msg/FakeMessenger.cc
branches/sage/cephmds2/osbdb/OSBDB.cc
branches/sage/cephmds2/osd/OSD.cc
branches/sage/cephmds2/osdc/Journaler.cc
branches/sage/cephmds2/osdc/ObjectCacher.cc
branches/sage/cephmds2/osdc/ObjectCacher.h
branches/sage/cephmds2/osdc/Objecter.cc
branches/sage/cephmds2/script/runset.pl
branches/sage/cephmds2/test/testos.cc
branches/sage/cephmds2/test/testosbdb.cc