From: David Zafman <david.zafman@inktank.com>
Date: Wed, 16 Apr 2014 22:09:09 +0000 (-0700)
Subject: Merge branch 'wip-8100'
X-Git-Tag: v0.80-rc1~36
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a3d759ebdd94c418886d0484af657edccb2e6769;p=ceph.git

Merge branch 'wip-8100'

Reviewed-by: Mark Nelson <mark.nelson@inktank.com>
---

a3d759ebdd94c418886d0484af657edccb2e6769