From: Sage Weil <sage@newdream.net>
Date: Fri, 20 Apr 2012 20:22:22 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.46~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0616c5b26dfe3cfe77997d895861b72938c4b958;p=ceph.git

Merge branch 'stable'

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

0616c5b26dfe3cfe77997d895861b72938c4b958