From: Sage Weil <sage@newdream.net>
Date: Tue, 1 May 2012 17:49:36 +0000 (-0700)
Subject: Merge branch 'wip-throttle'
X-Git-Tag: v0.47~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81d2f8887e1f1ccebf060722be82ad6b84db737e;p=ceph.git

Merge branch 'wip-throttle'

Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

81d2f8887e1f1ccebf060722be82ad6b84db737e