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 #37419 from rallytime/merge-2016.3

Browse source 
[2016.3] Merge forward from 2015.8 to 2016.3
This commit is contained in:
Nicole Thomas 2016-11-02 15:40:04 -06:00 • committed by GitHub
commit 7864f9b79d
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