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

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
	src/msg/xio/XioPortal.h
---

2a5ad8e3f72ee2e361bc18268141346761fdc763