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: 28b4429 e8ad6d2)

author	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 23:56:20 +0000 (15:56 -0800)
committer	Sage Weil <sage@newdream.net>
	Tue, 9 Nov 2010 23:56:20 +0000 (15:56 -0800)
commit	11cfcfe87503e50c892178d9c5c5b55da3aac740
tree	3ff329a806e37a37dda87a8e845fbc91e83dc648	tree \| snapshot
parent	28b44293e34c5e97f350b4c68becdf9e7767ed6f	commit \| diff
parent	e8ad6d26dcbed479c278c9fac84718303a5107c7	commit \| diff

Merge branch 'sched_scrub' into unstable

Conflicts:
src/osd/PG.cc
src/osd/PG.h

src/config.cc	diff1 \|	diff2 \|	blob \| history
src/config.h	diff1 \|	diff2 \|	blob \| history
src/include/ceph_strings.cc	diff1 \|	diff2 \|	blob \| history
src/include/rados.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	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/vstart.sh	diff1 \|	diff2 \|	blob \| history

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