]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #230 from ceph/wip-mon-paxos-fixes
authorSage Weil <sage@inktank.com>
Mon, 22 Apr 2013 22:11:46 +0000 (15:11 -0700)
committerSage Weil <sage@inktank.com>
Mon, 22 Apr 2013 22:11:46 +0000 (15:11 -0700)
commit5792be81add9041e3af2c9b27a939a4e2e7d378a
tree7da75ab53709421df7c19075dc27cb117a8bbc4f
parentc200cdb08108ae901c4c6f3625d55da707a38e5a
parent4b34b0e52b72a4a09bf193a6a556d2204bef8e6e
Merge pull request #230 from ceph/wip-mon-paxos-fixes

Wip mon paxos fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/common/config_opts.h
src/mon/OSDMonitor.cc
src/mon/PaxosService.h