]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-osdmap'
authorSage Weil <sage@newdream.net>
Tue, 21 Feb 2012 21:51:27 +0000 (13:51 -0800)
committerSage Weil <sage@newdream.net>
Tue, 21 Feb 2012 21:51:27 +0000 (13:51 -0800)
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
1  2 
src/mon/OSDMonitor.cc

Simple merge