]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
merge trunk changes r1058:1150 into branches/aleung/security1/ceph
authorsageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Thu, 1 Mar 2007 19:56:54 +0000 (19:56 +0000)
committersageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Thu, 1 Mar 2007 19:56:54 +0000 (19:56 +0000)
commitdbac3102a4f56151865de263ea1d67b1be299db6
treedbec5c7d78677ad1b43b038003d65b319426134e
parentba197ffce17f2de5cdf9a50ddc3d57ae02ba88ec
merge trunk changes r1058:1150 into branches/aleung/security1/ceph
- new monitor key boostrapping

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1151 29311d96-e01e-0410-9327-a35deaab8ce9
163 files changed:
branches/aleung/security1/ceph/Makefile
branches/aleung/security1/ceph/TODO
branches/aleung/security1/ceph/client/Client.cc
branches/aleung/security1/ceph/client/Client.h
branches/aleung/security1/ceph/client/FileCache.cc
branches/aleung/security1/ceph/client/SyntheticClient.cc
branches/aleung/security1/ceph/client/SyntheticClient.h
branches/aleung/security1/ceph/client/fuse.cc
branches/aleung/security1/ceph/client/hadoop/CephClientInterface.cc [new file with mode: 0644]
branches/aleung/security1/ceph/client/hadoop/CephClientInterface.h [new file with mode: 0644]
branches/aleung/security1/ceph/cmds.cc
branches/aleung/security1/ceph/cmon.cc
branches/aleung/security1/ceph/common/Clock.h
branches/aleung/security1/ceph/common/Timer.cc
branches/aleung/security1/ceph/common/Timer.h
branches/aleung/security1/ceph/config.cc
branches/aleung/security1/ceph/config.h
branches/aleung/security1/ceph/cosd.cc
branches/aleung/security1/ceph/crypto/ExtCap.h
branches/aleung/security1/ceph/doc/journal.txt
branches/aleung/security1/ceph/ebofs/BufferCache.cc
branches/aleung/security1/ceph/ebofs/BufferCache.h
branches/aleung/security1/ceph/ebofs/Ebofs.cc
branches/aleung/security1/ceph/ebofs/Ebofs.h
branches/aleung/security1/ceph/fakesyn.cc
branches/aleung/security1/ceph/include/buffer.h
branches/aleung/security1/ceph/include/object.h
branches/aleung/security1/ceph/include/reqid.h [new file with mode: 0644]
branches/aleung/security1/ceph/include/types.h
branches/aleung/security1/ceph/mds/AnchorClient.cc
branches/aleung/security1/ceph/mds/AnchorTable.cc
branches/aleung/security1/ceph/mds/CDentry.cc
branches/aleung/security1/ceph/mds/CDentry.h
branches/aleung/security1/ceph/mds/CDir.cc
branches/aleung/security1/ceph/mds/CDir.h
branches/aleung/security1/ceph/mds/CInode.cc
branches/aleung/security1/ceph/mds/CInode.h
branches/aleung/security1/ceph/mds/ClientMap.h
branches/aleung/security1/ceph/mds/Lock.h
branches/aleung/security1/ceph/mds/Locker.cc
branches/aleung/security1/ceph/mds/Locker.h
branches/aleung/security1/ceph/mds/LogEvent.cc
branches/aleung/security1/ceph/mds/LogEvent.h
branches/aleung/security1/ceph/mds/MDBalancer.cc
branches/aleung/security1/ceph/mds/MDBalancer.h
branches/aleung/security1/ceph/mds/MDCache.cc
branches/aleung/security1/ceph/mds/MDCache.h
branches/aleung/security1/ceph/mds/MDLog.cc
branches/aleung/security1/ceph/mds/MDLog.h
branches/aleung/security1/ceph/mds/MDS.cc
branches/aleung/security1/ceph/mds/MDS.h
branches/aleung/security1/ceph/mds/MDSMap.h
branches/aleung/security1/ceph/mds/MDStore.cc
branches/aleung/security1/ceph/mds/Migrator.cc
branches/aleung/security1/ceph/mds/Migrator.h
branches/aleung/security1/ceph/mds/OSDMonitor.cc [deleted file]
branches/aleung/security1/ceph/mds/OSDMonitor.h [deleted file]
branches/aleung/security1/ceph/mds/Renamer.cc
branches/aleung/security1/ceph/mds/Server.cc
branches/aleung/security1/ceph/mds/Server.h
branches/aleung/security1/ceph/mds/events/EAlloc.h
branches/aleung/security1/ceph/mds/events/EDirUpdate.h [deleted file]
branches/aleung/security1/ceph/mds/events/EExportFinish.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/events/EExportStart.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/events/EImportFinish.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/events/EImportMap.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/events/EImportStart.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/events/EInodeUpdate.h [deleted file]
branches/aleung/security1/ceph/mds/events/EMetaBlob.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/events/EMkdir.h [deleted file]
branches/aleung/security1/ceph/mds/events/EMknod.h [deleted file]
branches/aleung/security1/ceph/mds/events/EPurgeFinish.h
branches/aleung/security1/ceph/mds/events/EString.h
branches/aleung/security1/ceph/mds/events/ETrace.h [deleted file]
branches/aleung/security1/ceph/mds/events/EUnlink.h
branches/aleung/security1/ceph/mds/events/EUpdate.h [new file with mode: 0644]
branches/aleung/security1/ceph/mds/journal.cc
branches/aleung/security1/ceph/mds/mdstypes.h
branches/aleung/security1/ceph/mds/oldcachestuff.cc [deleted file]
branches/aleung/security1/ceph/messages/MCacheExpire.h
branches/aleung/security1/ceph/messages/MClientBoot.h
branches/aleung/security1/ceph/messages/MClientRequest.h
branches/aleung/security1/ceph/messages/MDiscoverReply.h
branches/aleung/security1/ceph/messages/MExportDir.h
branches/aleung/security1/ceph/messages/MExportDirPrep.h
branches/aleung/security1/ceph/messages/MFailure.h
branches/aleung/security1/ceph/messages/MFailureAck.h
branches/aleung/security1/ceph/messages/MMDSBeacon.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MMDSCacheRejoin.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MMDSCacheRejoinAck.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MMDSImportMap.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MMDSMap.h
branches/aleung/security1/ceph/messages/MMonElectionAck.h
branches/aleung/security1/ceph/messages/MMonElectionPropose.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MMonElectionVictory.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MMonPaxos.h [new file with mode: 0644]
branches/aleung/security1/ceph/messages/MNSLookup.h
branches/aleung/security1/ceph/messages/MNSLookupReply.h
branches/aleung/security1/ceph/messages/MNSRegister.h
branches/aleung/security1/ceph/messages/MNSRegisterAck.h
branches/aleung/security1/ceph/messages/MOSDBoot.h
branches/aleung/security1/ceph/messages/MOSDFailure.h
branches/aleung/security1/ceph/messages/MOSDOp.h
branches/aleung/security1/ceph/messages/MOSDOpReply.h
branches/aleung/security1/ceph/mkmonmap.cc
branches/aleung/security1/ceph/mon/ClientMonitor.cc
branches/aleung/security1/ceph/mon/ClientMonitor.h
branches/aleung/security1/ceph/mon/Elector.cc
branches/aleung/security1/ceph/mon/Elector.h
branches/aleung/security1/ceph/mon/MDSMonitor.cc
branches/aleung/security1/ceph/mon/MDSMonitor.h
branches/aleung/security1/ceph/mon/MonMap.h
branches/aleung/security1/ceph/mon/Monitor.cc
branches/aleung/security1/ceph/mon/Monitor.h
branches/aleung/security1/ceph/mon/MonitorStore.cc [new file with mode: 0644]
branches/aleung/security1/ceph/mon/MonitorStore.h [new file with mode: 0644]
branches/aleung/security1/ceph/mon/OSDMonitor.cc
branches/aleung/security1/ceph/mon/OSDMonitor.h
branches/aleung/security1/ceph/mon/Paxos.cc [new file with mode: 0644]
branches/aleung/security1/ceph/mon/Paxos.h [new file with mode: 0644]
branches/aleung/security1/ceph/msg/Dispatcher.h
branches/aleung/security1/ceph/msg/FakeMessenger.cc
branches/aleung/security1/ceph/msg/FakeMessenger.h
branches/aleung/security1/ceph/msg/HostMonitor.cc
branches/aleung/security1/ceph/msg/HostMonitor.h
branches/aleung/security1/ceph/msg/MPIMessenger.cc
branches/aleung/security1/ceph/msg/MPIMessenger.h
branches/aleung/security1/ceph/msg/MTMessenger.cc
branches/aleung/security1/ceph/msg/MTMessenger.h
branches/aleung/security1/ceph/msg/Message.cc
branches/aleung/security1/ceph/msg/Message.h
branches/aleung/security1/ceph/msg/Messenger.cc
branches/aleung/security1/ceph/msg/Messenger.h
branches/aleung/security1/ceph/msg/NewMessenger.cc
branches/aleung/security1/ceph/msg/NewMessenger.h
branches/aleung/security1/ceph/msg/NewerMessenger.cc
branches/aleung/security1/ceph/msg/NewerMessenger.h
branches/aleung/security1/ceph/msg/SerialMessenger.h
branches/aleung/security1/ceph/msg/SimpleMessenger.cc
branches/aleung/security1/ceph/msg/SimpleMessenger.h
branches/aleung/security1/ceph/msg/TCPDirectory.cc
branches/aleung/security1/ceph/msg/TCPDirectory.h
branches/aleung/security1/ceph/msg/TCPMessenger.cc
branches/aleung/security1/ceph/msg/TCPMessenger.h
branches/aleung/security1/ceph/msg/msg_types.h [new file with mode: 0644]
branches/aleung/security1/ceph/msg/tcp.h
branches/aleung/security1/ceph/newsyn.cc
branches/aleung/security1/ceph/osbdb/OSBDB.cc [new file with mode: 0644]
branches/aleung/security1/ceph/osbdb/OSBDB.h [new file with mode: 0644]
branches/aleung/security1/ceph/osd/FakeStore.cc
branches/aleung/security1/ceph/osd/FakeStore.h
branches/aleung/security1/ceph/osd/OSD.cc
branches/aleung/security1/ceph/osd/OSD.h
branches/aleung/security1/ceph/osd/OSDMap.h
branches/aleung/security1/ceph/osd/ObjectStore.h
branches/aleung/security1/ceph/osd/PG.cc
branches/aleung/security1/ceph/osd/PG.h
branches/aleung/security1/ceph/osd/osd_types.h [new file with mode: 0644]
branches/aleung/security1/ceph/osdc/Journaler.cc
branches/aleung/security1/ceph/osdc/ObjectCacher.cc
branches/aleung/security1/ceph/osdc/Objecter.cc
branches/aleung/security1/ceph/osdc/Objecter.h
branches/aleung/security1/ceph/test/testos.cc [new file with mode: 0644]