From: Sage Weil <sage@inktank.com>
Date: Fri, 14 Dec 2012 21:51:19 +0000 (-0800)
Subject: Merge branch 'wip-upstart' into next
X-Git-Tag: v0.56~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c728171b91ff477466ed11e7f48091a7fa5200f5;p=ceph.git

Merge branch 'wip-upstart' into next

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

c728171b91ff477466ed11e7f48091a7fa5200f5