From: Gary Lowell <gary.lowell@inktank.com>
Date: Wed, 10 Jul 2013 21:28:35 +0000 (-0700)
Subject: Merge branch 'wip-5492-gl' into next
X-Git-Tag: v0.67-rc1~83^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=348acecb8de1b2602811bc51b937b8c1858a0484;p=ceph.git

Merge branch 'wip-5492-gl' into next

Re-instate fix for #5492 with corrections.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
---

348acecb8de1b2602811bc51b937b8c1858a0484