git.apps.os.sepia.ceph.com Git

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

author	sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
	Mon, 26 Feb 2007 00:17:32 +0000 (00:17 +0000)
committer	sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
	Mon, 26 Feb 2007 00:17:32 +0000 (00:17 +0000)
commit	edcf4c0d73a35d80c457b29533fa54becab5a168
tree	dec8de2da299fbe1e6b0956a5cfffd963362ca1e	tree \| snapshot
parent	a32d6d32c1a92d3bc45399e235a7e80edd551fdd	commit \| diff

merge branches/riccardo/monitor1 changes into trunk (pg log storage fix, monitorstore, simplemssenger fixes, fakestore rewrite, and the latest monitor stuff)

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1130 29311d96-e01e-0410-9327-a35deaab8ce9

32 files changed:

trunk/ceph/Makefile		diff \| blob \| history
trunk/ceph/client/Client.cc		diff \| blob \| history
trunk/ceph/client/Client.h		diff \| blob \| history
trunk/ceph/config.cc		diff \| blob \| history
trunk/ceph/config.h		diff \| blob \| history
trunk/ceph/include/object.h		diff \| blob \| history
trunk/ceph/messages/MMonPaxos.h	[new file with mode: 0644]	blob
trunk/ceph/mon/Elector.cc		diff \| blob \| history
trunk/ceph/mon/Elector.h		diff \| blob \| history
trunk/ceph/mon/MDSMonitor.cc		diff \| blob \| history
trunk/ceph/mon/MDSMonitor.h		diff \| blob \| history
trunk/ceph/mon/Monitor.cc		diff \| blob \| history
trunk/ceph/mon/Monitor.h		diff \| blob \| history
trunk/ceph/mon/MonitorStore.cc	[new file with mode: 0644]	blob
trunk/ceph/mon/MonitorStore.h	[new file with mode: 0644]	blob
trunk/ceph/mon/OSDMonitor.cc		diff \| blob \| history
trunk/ceph/mon/OSDMonitor.h		diff \| blob \| history
trunk/ceph/mon/Paxos.cc	[new file with mode: 0644]	blob
trunk/ceph/mon/Paxos.h	[new file with mode: 0644]	blob
trunk/ceph/msg/Dispatcher.h		diff \| blob \| history
trunk/ceph/msg/FakeMessenger.cc		diff \| blob \| history
trunk/ceph/msg/Message.cc		diff \| blob \| history
trunk/ceph/msg/Message.h		diff \| blob \| history
trunk/ceph/msg/SimpleMessenger.cc		diff \| blob \| history
trunk/ceph/msg/msg_types.h		diff \| blob \| history
trunk/ceph/osd/FakeStore.cc		diff \| blob \| history
trunk/ceph/osd/FakeStore.h		diff \| blob \| history
trunk/ceph/osd/OSD.cc		diff \| blob \| history
trunk/ceph/osd/ObjectStore.h		diff \| blob \| history
trunk/ceph/osd/PG.cc		diff \| blob \| history
trunk/ceph/osd/PG.h		diff \| blob \| history
trunk/ceph/osd/osd_types.h		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom