saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29145 from alprs/fix-duplicate_import

Browse source 
Remove duplicate import of salt.utils.s3
This commit is contained in:
Mike Place 2015-11-24 08:36:05 -07:00
commit 4b4f212d2d
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/fileclient.py
View file

@ -556,8 +556,6 @@ class Client(object):
if url_data.scheme == 's3':
try:
import salt.utils.s3
def s3_opt(key, default=None):
'''Get value of s3.<key> from Minion config or from Pillar'''
if 's3.' + key in self.opts: