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: 4d6a6bb 095ff6a)

author	Sage Weil <sage@newdream.net>
	Mon, 7 Jul 2008 18:36:48 +0000 (11:36 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 7 Jul 2008 18:36:48 +0000 (11:36 -0700)
commit	182abcec9f4387ce817db8c711385d0a7f690445
tree	65021891713c40cc26fd374f2fd9c75ac6464340	tree \| snapshot
parent	4d6a6bba70fd3cb17003db60d8ce9849ac573810	commit \| diff
parent	095ff6a28e1d10a61d4dbdc4d7664442659d199f	commit \| diff

Merge branch 'unstable' into snap

src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	diff1 \|	diff2 \|	blob \| history
src/config.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/ObjectCacher.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/ObjectCacher.h	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	diff1 \|	diff2 \|	blob \| history

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