RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #27516 into master

Browse Source 
* refs/pull/27516/head:
	mgr/rook: Fix Python 2 regression

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gabriel Brascher <gabriel@apache.org>
This commit is contained in:
Sage Weil 2019-04-12 06:54:35 -05:00
commit fd36f2a836
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.githubmap
View File

@ -97,3 +97,4 @@ mikechristie Mike Christie <mchristi@redhat.com>
andrewschoen Andrew Schoen <aschoen@redhat.com>
mattbenjamin Matt Benjamin <mbenjami@redhat.com>
baruza Barbora Ančincová <bara@redhat.com>
GabrielBrascher Gabriel Brascher <gabriel@apache.org>

2
src/pybind/mgr/rook/rook_cluster.py
View File

@ -9,7 +9,6 @@ This module is runnable outside of ceph-mgr, useful for testing.
import logging
import json
from contextlib import contextmanager
from typing import List
from six.moves.urllib.parse import urljoin # pylint: disable=import-error
@ -23,6 +22,7 @@ except ImportError:
try:
import orchestrator
from rook.module import RookEnv
from typing import List
except ImportError:
pass # just used for type checking.