From: Zhi Zhang <zhangz.david@outlook.com>
Date: Mon, 21 Sep 2015 06:53:15 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v10.0.2~111^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ec9b658131446790ef51cd8b319af4fd7d9cf46;p=ceph.git

Merge remote-tracking branch 'upstream/master'
---

1ec9b658131446790ef51cd8b319af4fd7d9cf46