From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 3 Feb 2015 09:28:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/hammer'
X-Git-Tag: v0.93~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=352ad94842729f70482e679039e594db0c140203;p=ceph.git

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

352ad94842729f70482e679039e594db0c140203