]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11937 from SUSE/wip-16428-hammer
authorNathan Cutler <presnypreklad@gmail.com>
Wed, 23 Nov 2016 20:33:27 +0000 (21:33 +0100)
committerGitHub <noreply@github.com>
Wed, 23 Nov 2016 20:33:27 +0000 (21:33 +0100)
hammer: mon: prepare_pgtemp needs to only update up_thru if newer than the existing one

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/mon/OSDMonitor.cc

Simple merge