]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24146 into master
authorSage Weil <sage@redhat.com>
Sun, 14 Oct 2018 16:42:17 +0000 (11:42 -0500)
committerSage Weil <sage@redhat.com>
Sun, 14 Oct 2018 16:42:17 +0000 (11:42 -0500)
* refs/pull/24146/head:
mgr/orchestrator: Fix Python 3 issues

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/pybind/mgr/rook/module.py

Simple merge