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

Pylint fixes

Browse Source
This commit is contained in:
rallytime 2016-04-08 09:56:03 -06:00
parent 59b804d230
commit 5a641ddc2a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/status.py
View File

@ -33,6 +33,11 @@ from salt.exceptions import CommandExecutionError
__virtualname__ = 'status'
__opts__ = {}
# Don't shadow built-in's.
__func_alias__ = {
'time_': 'time'
}
def __virtual__():
if salt.utils.is_windows():
@ -909,7 +914,7 @@ def ping_master(master):
return result
def time(format='%A, %d. %B %Y %I:%M%p'):
def time_(format='%A, %d. %B %Y %I:%M%p'):
'''
.. versionadded:: 2016.3.0

2
salt/states/boto_asg.py
View File

@ -361,7 +361,7 @@ def present(
See the :mod:`salt.states.boto_cloudwatch_alarm` state for information
about these attributes.
If any alarm actions include ":self:" this will be replaced with the asg name.
For example, alarm_actions reading "['scaling_policy:self:ScaleUp']" will
map to the arn for this asg's scaling policy named "ScaleUp".