]> 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: fb7ce59 504c6ce)
Merge remote-tracking branch 'gh/wip-mon-doc'
authorSage Weil <sage@inktank.com>
Thu, 31 May 2012 23:42:38 +0000 (16:42 -0700)
committerSage Weil <sage@inktank.com>
Thu, 31 May 2012 23:42:38 +0000 (16:42 -0700)
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

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