From: Samuel Just <sam.just@inktank.com>
Date: Fri, 22 Mar 2013 21:15:31 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip_4435'
X-Git-Tag: v0.62~184
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16063db20e24d443aa38a04aae0f470df0d7693c;p=ceph.git

Merge remote-tracking branch 'upstream/wip_4435'

Fixes: #4435
Reviewed-by: David Zafman <david.zafman@inktank.com>
---

16063db20e24d443aa38a04aae0f470df0d7693c