]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d3f065 000310f)
Merge remote-tracking branch 'upstream/wip_4435'
authorSamuel Just <sam.just@inktank.com>
Fri, 22 Mar 2013 21:15:31 +0000 (14:15 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 22 Mar 2013 21:15:33 +0000 (14:15 -0700)
Fixes: #4435
Reviewed-by: David Zafman <david.zafman@inktank.com>
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.