]> 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: 446e077 c888d1d)
Merge pull request #334 from ceph/wip-mon
authorSage Weil <sage@inktank.com>
Thu, 30 May 2013 23:27:02 +0000 (16:27 -0700)
committerSage Weil <sage@inktank.com>
Thu, 30 May 2013 23:27:02 +0000 (16:27 -0700)
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

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