]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8398 from asheplyakov/hammer-wip-15336
authorSage Weil <sage@redhat.com>
Wed, 6 Apr 2016 14:40:51 +0000 (10:40 -0400)
committerSage Weil <sage@redhat.com>
Wed, 6 Apr 2016 14:40:51 +0000 (10:40 -0400)
hammer: monclient: avoid key renew storm on clock skew

1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge