From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Apr 2015 20:43:01 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v9.0.0~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1594daecc6edcc32da780f6618af7820aa9ecad8;p=ceph.git

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
---

1594daecc6edcc32da780f6618af7820aa9ecad8