From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Sep 2013 17:07:26 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-6179'
X-Git-Tag: v0.69~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d71cd549504832d121824f1508498023bcacbbfd;p=ceph.git

Merge remote-tracking branch 'gh/wip-6179'

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

d71cd549504832d121824f1508498023bcacbbfd