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: 83432af 030ad87)

author	Sage Weil <sage@newdream.net>
	Thu, 2 Feb 2012 18:55:41 +0000 (10:55 -0800)
committer	Sage Weil <sage@newdream.net>
	Thu, 2 Feb 2012 18:55:41 +0000 (10:55 -0800)
commit	04753e9a349389ece027aff146b4d4dda5c6d5af
tree	093efd88a7acc063c31f24574a9578fb64d3aac4	tree \| snapshot
parent	83432af2adce75676b734d2b99dd88372ede833a	commit \| diff
parent	030ad87221649ddd6483966292a22d4a559fdb66	commit \| diff

Merge remote-tracking branch 'gh/wip-osd-op-tracking'

Reviewed-by: Sage Weil <sage@newdream.net>

src/common/Throttle.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history

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