]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
merged trunk changes r1407:1446 into branches/sage/cephmds2
authorsageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Tue, 26 Jun 2007 22:50:17 +0000 (22:50 +0000)
committersageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Tue, 26 Jun 2007 22:50:17 +0000 (22:50 +0000)
commit9d73dc45207e0575013f3559514985d2a60444ca
treed2fbb019a1f4df0c6efeb68d896c9026c259b98e
parent918e5a2ef3c68edd8fbf8cd341baac03a826c168
merged trunk changes r1407:1446 into branches/sage/cephmds2

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1447 29311d96-e01e-0410-9327-a35deaab8ce9
38 files changed:
branches/sage/cephmds2/Makefile
branches/sage/cephmds2/client/Client.cc
branches/sage/cephmds2/config.cc
branches/sage/cephmds2/config.h
branches/sage/cephmds2/ebofs/Ebofs.cc
branches/sage/cephmds2/ebofs/Ebofs.h
branches/sage/cephmds2/ebofs/FileJournal.cc
branches/sage/cephmds2/ebofs/FileJournal.h
branches/sage/cephmds2/ebofs/Journal.h
branches/sage/cephmds2/ebofs/test.ebofs.cc
branches/sage/cephmds2/ebofs/types.h
branches/sage/cephmds2/include/Context.h
branches/sage/cephmds2/include/buffer.h
branches/sage/cephmds2/mds/Migrator.cc
branches/sage/cephmds2/messages/MMonElection.h [new file with mode: 0644]
branches/sage/cephmds2/messages/MMonElectionAck.h [deleted file]
branches/sage/cephmds2/messages/MMonElectionPropose.h [deleted file]
branches/sage/cephmds2/messages/MMonElectionVictory.h [deleted file]
branches/sage/cephmds2/messages/MMonPaxos.h
branches/sage/cephmds2/mon/ClientMonitor.cc
branches/sage/cephmds2/mon/ClientMonitor.h
branches/sage/cephmds2/mon/Elector.cc
branches/sage/cephmds2/mon/Elector.h
branches/sage/cephmds2/mon/MDSMonitor.cc
branches/sage/cephmds2/mon/MDSMonitor.h
branches/sage/cephmds2/mon/Monitor.cc
branches/sage/cephmds2/mon/Monitor.h
branches/sage/cephmds2/mon/OSDMonitor.cc
branches/sage/cephmds2/mon/Paxos.cc
branches/sage/cephmds2/mon/Paxos.h
branches/sage/cephmds2/mon/PaxosService.cc [new file with mode: 0644]
branches/sage/cephmds2/mon/PaxosService.h [new file with mode: 0644]
branches/sage/cephmds2/mon/mon_types.h [new file with mode: 0644]
branches/sage/cephmds2/msg/FakeMessenger.cc
branches/sage/cephmds2/msg/Message.cc
branches/sage/cephmds2/msg/Message.h
branches/sage/cephmds2/osd/OSD.cc
branches/sage/cephmds2/osd/ObjectStore.h