From: Sage Weil <sage@redhat.com>
Date: Fri, 27 Mar 2015 00:09:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v10.2.6~165^2^2~520
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcb5e8da9dacd98bf9720dda44c33836d94c3171;p=ceph.git

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	.gitignore
---

dcb5e8da9dacd98bf9720dda44c33836d94c3171