]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #925 from ceph/wip-mon-api
authorGregory Farnum <greg@inktank.com>
Wed, 11 Dec 2013 21:27:03 +0000 (13:27 -0800)
committerGregory Farnum <greg@inktank.com>
Wed, 11 Dec 2013 21:27:03 +0000 (13:27 -0800)
Merge in changes to unify the API presented by the monitors and handle changes gracefully.

(Upgrade tests) Tested-by: Tamil Muthamizhan <tamil.muthamizhan@inktank.com>

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
1  2 
src/common/config_opts.h

Simple merge