From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Mar 2015 19:45:16 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v9.0.0~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0bee27461da6c3634acd9bf477f7946b6eade796;p=ceph.git

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
---

0bee27461da6c3634acd9bf477f7946b6eade796