From: Sage Weil <sage@inktank.com>
Date: Tue, 20 Aug 2013 23:57:46 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-6004' into next
X-Git-Tag: v0.68~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf8dbd248b8792781394fe87db141ad5704dc3b3;p=ceph.git

Merge remote-tracking branch 'gh/wip-6004' into next

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
---

cf8dbd248b8792781394fe87db141ad5704dc3b3