]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #241 from ceph/wip-4798
authorSage Weil <sage@inktank.com>
Wed, 24 Apr 2013 00:17:02 +0000 (17:17 -0700)
committerSage Weil <sage@inktank.com>
Wed, 24 Apr 2013 00:17:02 +0000 (17:17 -0700)
commite09efda7c8c5a0432bdd1dee7f773ccc0f6b83df
tree5188ae53cdacb022fa9f3039994da3d4a381c2c0
parent48631c114acda864c03d71d0895ce9def9aadcd9
parent95ed73a73badd7d3998b71c40adeb185bdb567bd
Merge pull request #241 from ceph/wip-4798

#4798

Reviewed-by: Greg Farnum <greg@inktank.com>
src/mon/Monitor.cc
src/mon/Monitor.h