From: Samuel Just <sam.just@inktank.com>
Date: Thu, 12 Feb 2015 01:26:05 +0000 (-0800)
Subject: Merge pull request #3676 from majianpeng/misc
X-Git-Tag: v0.93~51^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7885bd249856ffcca50e3b9bed08b408fa2c5275;p=ceph.git

Merge pull request #3676 from majianpeng/misc

Misc

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

7885bd249856ffcca50e3b9bed08b408fa2c5275