]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
merged branches/sage/mon2 r1462 into trunk/ceph
authorsageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Sun, 1 Jul 2007 14:43:27 +0000 (14:43 +0000)
committersageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Sun, 1 Jul 2007 14:43:27 +0000 (14:43 +0000)
commit1c91e2cbd20368e13679ffb12e2b1547781051eb
treed57ebe1d6e32cb344aee3d75c66b31787871f65b
parent41e1212bda54aafca964e06abbc04c1dc30835ad
merged branches/sage/mon2 r1462 into trunk/ceph

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1463 29311d96-e01e-0410-9327-a35deaab8ce9
36 files changed:
trunk/ceph/TODO
trunk/ceph/client/Client.cc
trunk/ceph/client/Client.h
trunk/ceph/cmonctl.cc
trunk/ceph/config.cc
trunk/ceph/config.h
trunk/ceph/cosd.cc
trunk/ceph/mds/MDS.cc
trunk/ceph/mds/MDSMap.h
trunk/ceph/messages/MClientMount.h
trunk/ceph/messages/MClientUnmount.h
trunk/ceph/messages/MMDSBeacon.h
trunk/ceph/messages/MMonCommand.h
trunk/ceph/messages/MMonPaxos.h
trunk/ceph/messages/MOSDBoot.h
trunk/ceph/messages/MOSDFailure.h
trunk/ceph/messages/MOSDGetMap.h
trunk/ceph/mon/ClientMonitor.cc
trunk/ceph/mon/ClientMonitor.h
trunk/ceph/mon/Elector.cc
trunk/ceph/mon/MDSMonitor.cc
trunk/ceph/mon/MDSMonitor.h
trunk/ceph/mon/MonMap.h
trunk/ceph/mon/Monitor.cc
trunk/ceph/mon/MonitorStore.cc
trunk/ceph/mon/OSDMonitor.cc
trunk/ceph/mon/OSDMonitor.h
trunk/ceph/mon/Paxos.cc
trunk/ceph/mon/Paxos.h
trunk/ceph/mon/PaxosService.cc
trunk/ceph/mon/PaxosService.h
trunk/ceph/msg/FakeMessenger.cc
trunk/ceph/osd/OSD.cc
trunk/ceph/osd/OSDMap.h
trunk/ceph/osd/PG.cc
trunk/ceph/osdc/Objecter.cc