]> 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: 6ae9bbb bd68b82)
Merge branch 'wip-mon-compact' into next
authorSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 18:49:31 +0000 (11:49 -0700)
committerSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 18:49:31 +0000 (11:49 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

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