From: Sage Weil <sage@redhat.com>
Date: Fri, 20 Feb 2015 05:28:16 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: suse_latest~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9cdce7677c6ac2e8862c0c729a9fd4400927ee7;p=ceph.git

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

e9cdce7677c6ac2e8862c0c729a9fd4400927ee7