]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 039a3a9 bb270f8)
Merge remote-tracking branch 'gh/wip-mon-rank' into next
authorSage Weil <sage@inktank.com>
Thu, 2 May 2013 20:32:41 +0000 (13:32 -0700)
committerSage Weil <sage@inktank.com>
Thu, 2 May 2013 20:32:41 +0000 (13:32 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@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.