From: Sage Weil <sage@inktank.com>
Date: Fri, 13 Dec 2013 17:58:10 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.75~115
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d5ac73658d06ae9d103bac73c4d6a20accb66dec;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

d5ac73658d06ae9d103bac73c4d6a20accb66dec