From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 24 Jan 2015 23:37:09 +0000 (-0800)
Subject: Merge branch 'wip-8902'
X-Git-Tag: v0.93~193
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3bdd385ff9be1ffe51ba247c269ed07b39b6f35;p=ceph.git

Merge branch 'wip-8902'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

f3bdd385ff9be1ffe51ba247c269ed07b39b6f35