From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 13 May 2015 14:00:44 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v9.0.2~175
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2ad46408d2f4cb7335de7490bffb2921a4a0cd1;p=ceph.git

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

a2ad46408d2f4cb7335de7490bffb2921a4a0cd1