From: Sage Weil <sage@inktank.com>
Date: Sat, 9 Feb 2013 17:40:34 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.58~114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ead68b47f44deee4183aabf4418c258f77c19202;p=ceph.git

Merge branch 'next'

Conflicts:
	src/mon/PGMonitor.h
---

ead68b47f44deee4183aabf4418c258f77c19202