From: Sage Weil <sage@inktank.com>
Date: Tue, 18 Dec 2012 00:51:20 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/testing' into next
X-Git-Tag: v0.56~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0dd1302543422e2bac65d634ed2f1f4260dcae79;p=ceph.git

Merge remote-tracking branch 'gh/testing' into next
---

0dd1302543422e2bac65d634ed2f1f4260dcae79