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

Merge branch '2015.8' into '2016.3'

Browse Source 
No conflicts.
This commit is contained in:
rallytime 2016-11-02 11:18:20 -06:00
commit bce47c9175
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/jboss7.py
View File

@ -531,6 +531,12 @@ def __check_dict_contains(dct, dict_name, keys, comment='', result=True):
def __append_comment(new_comment, current_comment=''):
if current_comment is None and new_comment is None:
return ''
if current_comment is None:
return new_comment
if new_comment is None:
return current_comment
return current_comment+'\n'+new_comment