]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7883 from tchaikov/wip-12848-hammer
authorLoic Dachary <loic@dachary.org>
Wed, 6 Apr 2016 14:20:15 +0000 (16:20 +0200)
committerLoic Dachary <loic@dachary.org>
Wed, 6 Apr 2016 14:20:15 +0000 (16:20 +0200)
hammer: osd: use GMT time for the object name of hitsets

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/common/config_opts.h
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/ReplicatedPG.cc

Simple merge
Simple merge
Simple merge
Simple merge