From: Sage Weil <sage@inktank.com>
Date: Thu, 9 May 2013 00:45:03 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.63~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5177fcb6bf384d5c9caed9b28f28f656823b3d64;p=ceph.git

Merge remote-tracking branch 'gh/next'

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

5177fcb6bf384d5c9caed9b28f28f656823b3d64