From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Mar 2015 13:24:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v9.0.0~192
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=faa1f2741c0f287af5909e95bf202da3778092da;p=ceph.git

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
---

faa1f2741c0f287af5909e95bf202da3778092da