]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #19966 from smithfarm/wip-22706-luminous
authorYuri Weinstein <yuri.weinstein@gmail.com>
Fri, 2 Feb 2018 22:59:08 +0000 (14:59 -0800)
committerGitHub <noreply@github.com>
Fri, 2 Feb 2018 22:59:08 +0000 (14:59 -0800)
luminous: tests: force backfill test can conflict with pool removal

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mgr/DaemonServer.cc

Simple merge