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 branch '2015.8' into '2016.3'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-09-06 10:52:01 -06:00
commit e9c634685b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/consul.py
View file

@ -609,11 +609,10 @@ def agent_join(consul_url=None, address=None, **kwargs):
query_params=query_params)
if res['res']:
ret['res'] = True
ret['message'] = ('Agent maintenance mode '
'{0}ed.'.format(kwargs['enable']))
ret['message'] = 'Agent joined the cluster'
else:
ret['res'] = False
ret['message'] = 'Unable to change maintenance mode for agent.'
ret['message'] = 'Unable to join the cluster.'
return ret