From: Sage Weil <sage@redhat.com>
Date: Sat, 9 Aug 2014 06:00:13 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.85~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d2d4dd56ecbec7d29590f3ee9f84cfaf47efad5;p=ceph.git

Merge branch 'next'

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

4d2d4dd56ecbec7d29590f3ee9f84cfaf47efad5