From: Sage Weil <sage@inktank.com>
Date: Sun, 2 Feb 2014 17:40:11 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.78~233
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4ff4720d5958c794541bb1b83217a7c636822ed;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/mon/OSDMonitor.cc
	src/osd/OSDMap.h
---

e4ff4720d5958c794541bb1b83217a7c636822ed