]> 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: 8af46a4 c4c59a0)
Merge branch 'next'
authorSage Weil <sage.weil@dreamhost.com>
Sun, 29 Apr 2012 01:18:41 +0000 (18:18 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sun, 29 Apr 2012 01:18:41 +0000 (18:18 -0700)
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.