]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #16709 from dzafman/wip-standalone
authorSage Weil <sage@newdream.net>
Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
committerGitHub <noreply@github.com>
Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
qa/standalone: misc fixes

1  2 
src/osd/PG.cc
src/osd/PrimaryLogPG.cc

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