]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2157bcb 4ce9da3)
Merge branch 'master' of github.com:ceph/ceph
authorPeter Reiher <reiher@inktank.com>
Mon, 29 Oct 2012 19:47:18 +0000 (12:47 -0700)
committerPeter Reiher <reiher@inktank.com>
Mon, 29 Oct 2012 19:47:18 +0000 (12:47 -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.