]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #22615 into master
authorSage Weil <sage@redhat.com>
Sat, 23 Jun 2018 22:04:46 +0000 (17:04 -0500)
committerSage Weil <sage@redhat.com>
Sat, 23 Jun 2018 22:04:46 +0000 (17:04 -0500)
commitdc4e35b523c31581afaa0c8d63a22a3c5d62a5cf
treed00dc3eeb31d8d564417880390f8d47ca110cef4
parentde0206cb8036218c06fd91ba71822acc602c3540
parent33464cc5c7dd6c9318c171e79f655c283cc89435
Merge PR #22615 into master

* refs/pull/22615/head:
common: fix enum redeclaration

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
src/librbd/ImageCtx.cc
src/os/bluestore/BlueStore.cc
src/osd/OSD.cc
src/osdc/ObjectCacher.cc