valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into patch-1

Browse Source
This commit is contained in:
Nicole Thomas 2017-10-13 09:54:04 -04:00 committed by GitHub
commit 3163bddd61
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/boto_elbv2.py
View File

@ -33,6 +33,9 @@ Connection module for Amazon ALB
keyid: GKTADJGHEIQSXMKKRBJ08H keyid: GKTADJGHEIQSXMKKRBJ08H
key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
region: us-east-1 region: us-east-1
:depends: boto3
''' '''
# keep lint from choking on _get_conn and _cache_id # keep lint from choking on _get_conn and _cache_id
# pylint: disable=E0602 # pylint: disable=E0602
@ -52,6 +55,8 @@ from salt.ext import six
try: try:
# pylint: disable=unused-import # pylint: disable=unused-import
import salt.utils.boto3 import salt.utils.boto3
import boto3
import botocore
# pylint: enable=unused-import # pylint: enable=unused-import
# TODO Version check using salt.utils.versions # TODO Version check using salt.utils.versions