From: Samuel Just <sam.just@inktank.com>
Date: Mon, 11 May 2015 17:34:53 +0000 (-0700)
Subject: Merge pull request #4352 from majianpeng/misc-fix
X-Git-Tag: v9.0.2~193
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7abe87c96d78a9a6370fa9f2fc9b21339a0a01f;p=ceph.git

Merge pull request #4352 from majianpeng/misc-fix

Misc fix

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
---

e7abe87c96d78a9a6370fa9f2fc9b21339a0a01f