From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Aug 2014 14:08:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.85~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd64a63db003cda310d983b225bbb789552bc3a9;p=ceph.git

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

cd64a63db003cda310d983b225bbb789552bc3a9