]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26660 into master
authorSage Weil <sage@redhat.com>
Sat, 9 Mar 2019 15:29:33 +0000 (09:29 -0600)
committerSage Weil <sage@redhat.com>
Sat, 9 Mar 2019 15:29:33 +0000 (09:29 -0600)
* refs/pull/26660/head:
include/intarith: enforce the same type for p2*() arguments

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/os/bluestore/BlueStore.cc

Simple merge