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: c55c6ab 01a07c1)

author	Samuel Just <sam.just@inktank.com>
	Fri, 10 May 2013 05:24:25 +0000 (22:24 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 10 May 2013 05:24:31 +0000 (22:24 -0700)
commit	b353da6f682d223ba14812da0fe814eca72ad6f5
tree	07760f90fb83049be7123a6528544aa4d98e7f31	tree \| snapshot
parent	c55c6abb6055ff7983dd7b1b7c7903e8b08e23b4	commit \| diff
parent	01a07c1ee1ea2ef134f5fddf19518eb3c0349b53	commit \| diff

Merge branch 'wip_pg_res'

Reviewed-by: Sage Weil <sage@inktank.com>

src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/tools/ceph-filestore-dump.cc	diff1 \|	diff2 \|	blob \| history

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