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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 03901bd 11dcd42)

author	Sage Weil <sage@newdream.net>
	Sat, 30 Jan 2010 00:24:39 +0000 (16:24 -0800)
committer	Sage Weil <sage@newdream.net>
	Sat, 30 Jan 2010 00:24:39 +0000 (16:24 -0800)
commit	1deaee929ae464ffc311cc4cc58e2823e47e745e
tree	c74a32f9938175a590d237de8aca1561765e170e	tree \| snapshot
parent	03901bdf23fa60eb10b8d88c38e5e6a90f484a85	commit \| diff
parent	11dcd420d01abfdac460b507e2d37dace1760cba	commit \| diff

Merge commit 'origin/unstable' into filestore

src/TODO	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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