From: Sage Weil <sage@inktank.com>
Date: Tue, 27 Aug 2013 01:11:32 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.69~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6fe776c3a04ddbc015ca104fa67ea8248bd0df9;p=ceph.git

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

a6fe776c3a04ddbc015ca104fa67ea8248bd0df9