]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5315 from tchaikov/wip-10930
authorKefu Chai <tchaikov@gmail.com>
Fri, 21 Aug 2015 03:18:32 +0000 (11:18 +0800)
committerKefu Chai <tchaikov@gmail.com>
Fri, 21 Aug 2015 03:18:32 +0000 (11:18 +0800)
mon: remove osd_epoch to avoid out-dated osdmap_cache

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/Monitor.cc
src/mon/OSDMonitor.cc

Simple merge
Simple merge