Merge branch '2017.7' into win_fix_netapi_cherrypy

This commit is contained in:
Nicole Thomas 2017-09-01 09:10:51 -04:00 committed by GitHub
commit fd74acb603

View file

@ -10,7 +10,7 @@ import os
import salt.auth
from salt.utils.versions import StrictVersion as _StrictVersion
__virtualname__ = os.path.abspath(__file__).rsplit('/')[-2] or 'rest_tornado'
__virtualname__ = os.path.abspath(__file__).rsplit(os.sep)[-2] or 'rest_tornado'
logger = logging.getLogger(__virtualname__)