From: Sage Weil <sage@newdream.net>
Date: Mon, 21 May 2012 04:18:36 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.48argonaut~137^2~26
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d8f4c6d20877f7f710664f5344f18f641d63c649;p=ceph.git

Merge branch 'stable'

Conflicts:
	src/os/FileStore.cc
---

d8f4c6d20877f7f710664f5344f18f641d63c649