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: 966369a fd397ab)

author	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 23:46:54 +0000 (15:46 -0800)
commit	c2d6d05fa4a70474318ac70dd1cadb8d5424e7e4
tree	55496ef782b7673a144c6a04d42eeb697a3079d4	tree \| snapshot
parent	966369aad07461f2610b4dd2a9cdc770155c5a89	commit \| diff
parent	fd397abad2d96a62cb88996797d11eafc33d909e	commit \| diff

Merge branch 'scrub_no_lock' into unstable

src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history

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