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

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

8fb472995e807e7e95863d73f366ec02c5b3edc3