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: 03da8ba 0ef0ab4)

author	Sage Weil <sage@newdream.net>
	Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 9 Feb 2010 16:15:31 +0000 (08:15 -0800)
commit	3f429e005e4a7c24aaadbc7c6acb33bf7308fc2e
tree	c532fd2655b1a475e9d1b704cb062d62b27ca97c	tree \| snapshot
parent	03da8ba90603290f284da38fc144d50bc36fac97	commit \| diff
parent	0ef0ab4b45e41eb427661b6bb2382e8ded0828a2	commit \| diff

Merge branch 'unstable' into filestore

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history

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