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

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

8221687f5ae319ea4792cca7a41d485daaf55eea