]> 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: 3c64784 0d20cae)
Merge pull request #599 from ceph/wip-6323
authorSage Weil <sage@inktank.com>
Mon, 23 Sep 2013 21:12:33 +0000 (14:12 -0700)
committerSage Weil <sage@inktank.com>
Mon, 23 Sep 2013 21:12:33 +0000 (14:12 -0700)
mon: OSDMonitor: fix #6322 and #6323

Reviewed-by: Greg Farnum <greg@inktank.com>
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.