]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ab7db6 02aca68)
Merge branch 'wip-upstart' into next
authorSage Weil <sage@inktank.com>
Fri, 14 Dec 2012 21:51:19 +0000 (13:51 -0800)
committerSage Weil <sage@inktank.com>
Fri, 14 Dec 2012 21:51:19 +0000 (13:51 -0800)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.