]> 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: fdc0534 418cff5)
Merge remote-tracking branch 'gh/bobtail-deploy' into bobtail-next
authorSage Weil <sage@inktank.com>
Wed, 1 May 2013 19:57:43 +0000 (12:57 -0700)
committerSage Weil <sage@inktank.com>
Wed, 1 May 2013 19:57:43 +0000 (12:57 -0700)
1  2 
src/init-ceph.in patch | diff1 | diff2 | blob | history

diff --cc src/init-ceph.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.