From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Feb 2013 20:47:30 +0000 (-0800)
Subject: Merge branch 'wip-deploy'
X-Git-Tag: v0.58~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9c770358e32decb49c4806f83998b740b1cf0d2;p=ceph.git

Merge branch 'wip-deploy'

Reviewed-by: Greg Farnum <greg@inktank.com>
---

e9c770358e32decb49c4806f83998b740b1cf0d2