From: Sage Weil <sage@inktank.com>
Date: Wed, 4 Sep 2013 17:43:04 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-6047'
X-Git-Tag: v0.71~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a4f4f0d7a48a5c673ba0fc494bbf042650a8f22;p=ceph.git

Merge remote-tracking branch 'gh/wip-6047'

Reviewed-by: Sage Weil <sage@inktank.com>
---

6a4f4f0d7a48a5c673ba0fc494bbf042650a8f22