]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/wip-mon-encoding'
authorSage Weil <sage@inktank.com>
Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
committerSage Weil <sage@inktank.com>
Wed, 16 May 2012 23:55:04 +0000 (16:55 -0700)
commitef71d85eefecbc438a73f967307e44f7910d5692
tree0a7bf392a370b8cd20fd25b83dfefd7b56db178d
parentf161c62322a7c863a3835b9c7e7d6481b3c07d18
parent24fddf217459450553092b937a3c4c92c7e2e3a2
Merge remote-tracking branch 'gh/wip-mon-encoding'

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