From: Sage Weil <sage@redhat.com>
Date: Mon, 8 Sep 2014 19:19:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.86~125
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c050afdbe01e4204de988ef2dba28dd4ba1c34e2;p=ceph.git

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

c050afdbe01e4204de988ef2dba28dd4ba1c34e2