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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bea73a7 f7add28)

author	Sage Weil <sage@newdream.net>
	Tue, 1 Jan 2008 23:57:27 +0000 (15:57 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 1 Jan 2008 23:57:27 +0000 (15:57 -0800)
commit	87f4ebe762dc795b755f3a4fe9df0bb22c606c9c
tree	94cae2035942eab8502c4bfe4e76c9b24a31c5ea	tree \| snapshot
parent	bea73a7c040ad2048e14458370da8b69f35e9642	commit \| diff
parent	f7add28b23204e1148b49550eedad4540155ac67	commit \| diff

Merge branch 'master' into rados

Conflicts:

.gitignore
src/TODO

src/TODO	diff1 \|	diff2 \|	blob \| history
src/client/SyntheticClient.cc	diff1 \|	diff2 \|	blob \| history
src/messages/MClientRequest.h	diff1 \|	diff2 \|	blob \| history
src/messages/MOSDOp.h	diff1 \|	diff2 \|	blob \| history
src/messages/MOSDOpReply.h	diff1 \|	diff2 \|	blob \| history
src/mon/MonMap.h	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history

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