]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-upstart'
authorSage Weil <sage@inktank.com>
Wed, 16 May 2012 23:53:45 +0000 (16:53 -0700)
committerSage Weil <sage@inktank.com>
Wed, 16 May 2012 23:53:45 +0000 (16:53 -0700)
Reviewed-by: Tommi Virtanen <tv@inktank.com>

Trivial merge