From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 27 Jan 2015 00:09:33 +0000 (-0800)
Subject: Merge pull request #315 from ceph/wip-10577
X-Git-Tag: v0.94.10~27^2^2~187^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69575263a3393753d08f0a3bbb0bad37b3ef5eea;p=ceph.git

Merge pull request #315 from ceph/wip-10577

Added "branch: dumpling" to fix #10577

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

69575263a3393753d08f0a3bbb0bad37b3ef5eea