From: Sage Weil <sage@redhat.com>
Date: Sun, 18 Jan 2015 18:41:55 +0000 (-0800)
Subject: Merge pull request #3385 from majianpeng/misc
X-Git-Tag: v0.93~261
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba73ef93783a079d17d6acdc7ba04c6a7a24e744;p=ceph.git

Merge pull request #3385 from majianpeng/misc

Misc

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

ba73ef93783a079d17d6acdc7ba04c6a7a24e744