]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #457 from ceph/wip-paxos
authorSage Weil <sage@inktank.com>
Tue, 23 Jul 2013 01:28:54 +0000 (18:28 -0700)
committerSage Weil <sage@inktank.com>
Tue, 23 Jul 2013 01:28:54 +0000 (18:28 -0700)
paxos fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
1  2 
src/common/config_opts.h

Simple merge