From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 26 Feb 2015 02:52:36 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/hammer'
X-Git-Tag: v9.0.0~247
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01099766d763d09b03ff10ab6df8215527a3ce2b;p=ceph.git

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

01099766d763d09b03ff10ab6df8215527a3ce2b