]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5726 from ceph/wip-12752
authorLoic Dachary <loic@dachary.org>
Tue, 20 Oct 2015 19:37:58 +0000 (21:37 +0200)
committerLoic Dachary <loic@dachary.org>
Tue, 20 Oct 2015 19:37:58 +0000 (21:37 +0200)
is_new_interval() fixes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/osd_types.cc
src/osd/osd_types.h
src/osdc/Objecter.cc
src/osdc/Objecter.h

Simple merge
Simple merge
Simple merge
Simple merge