From: Sage Weil <sage@inktank.com>
Date: Tue, 19 Jun 2012 21:29:43 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.49~83^2~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c70c09f63a2c811af2f63e3d77a5876999cc214c;p=ceph.git

Merge remote-tracking branch 'gh/next'

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

c70c09f63a2c811af2f63e3d77a5876999cc214c