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

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
	src/osd/ReplicatedPG.cc
---

497737aabff4f457fc757930d7e9a4519263b9cb