From: Sage Weil <sage@inktank.com>
Date: Mon, 10 Feb 2014 18:19:55 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.78~209
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c5783cc6cf5c752de0cd513b22fa3702e19b333;p=ceph.git

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

2c5783cc6cf5c752de0cd513b22fa3702e19b333