From: Sage Weil <sage@inktank.com>
Date: Fri, 9 May 2014 17:58:35 +0000 (-0700)
Subject: Merge tag 'v0.80'
X-Git-Tag: v0.81~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9038954419982f3667774c4324aa53168a0bbff;p=ceph.git

Merge tag 'v0.80'

v0.80

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

d9038954419982f3667774c4324aa53168a0bbff