]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSDMonitor::prepare_pgtemp: only update up_thru if newer 11937/head
authorSamuel Just <sjust@redhat.com>
Wed, 8 Jun 2016 00:15:05 +0000 (17:15 -0700)
committerNathan Cutler <ncutler@suse.com>
Sat, 12 Nov 2016 13:36:23 +0000 (14:36 +0100)
commit4c780bd7fc6e8a98334ddd049a4969d88a9de49f
tree0a13085447f443e88f34314e79208c4fc154cfc2
parentf776699fd00ff5f0deea15ec4f2efb991831b055
OSDMonitor::prepare_pgtemp: only update up_thru if newer

Fixes: http://tracker.ceph.com/issues/16185
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5f2bd7b6b28aad96d68444b22c04b8b24564616b)

Conflicts:
src/mon/OSDMonitor.cc (master uses C++11 "auto" for new_up_thru
        iterator, replace with explicit type)
src/mon/OSDMonitor.h (trivial resolution)
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h