From: Sage Weil <sage@inktank.com>
Date: Sat, 7 Dec 2013 00:56:10 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-fix-3x'
X-Git-Tag: v0.74~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a52ef1df490450e5639128020dd25b47345435e8;p=ceph.git

Merge remote-tracking branch 'gh/wip-fix-3x'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

a52ef1df490450e5639128020dd25b47345435e8