From: Sage Weil <sage@redhat.com>
Date: Tue, 7 Apr 2015 19:57:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v9.0.0~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=980d8f9da0caa9618a2c287bea8cf9ec8ea20d15;p=ceph.git

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
---

980d8f9da0caa9618a2c287bea8cf9ec8ea20d15