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: a48739d aca0aea)

author	Greg Farnum <greg@inktank.com>
	Tue, 9 Apr 2013 19:11:15 +0000 (12:11 -0700)
committer	Greg Farnum <greg@inktank.com>
	Tue, 9 Apr 2013 19:11:15 +0000 (12:11 -0700)
commit	cecbb4d88a9a2f0fc16829c23c0f1dd62d087b85
tree	2e69949d845982517b2a076b45655bc87f116410	tree \| snapshot
parent	a48739d9ab69b8372723139f652717709910e4d2	commit \| diff
parent	aca0aea1bfbafba9cab1b2c693760b824bd82d30	commit \| diff

Merge remote-tracking branch 'origin/wip-osd-throttle2' into next

Reviewed-by: Greg Farnum <greg@inktank.com>

src/msg/Pipe.cc

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