]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25976 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:20:18 +0000 (17:20 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:20:18 +0000 (17:20 -0800)
* refs/pull/25976/head:
Objecter::calc_op_budget: Fix invalid access to extent union member

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/osdc/Objecter.cc

Simple merge