Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2016.3] Merge forward from 2015.8 to 2016.3 #36915

Merged
merged 3 commits into from
Oct 11, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #36915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdbf161
Check for test=True in salt.wait_for_event orchestration events (#36897)
Oct 10, 2016
f3443fb
Properly handle "shared" arg in git.init when it is a bool (#36912)
Oct 11, 2016
971c27c
Merge branch '2015.8' into '2016.3'
Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion salt/modules/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,7 +1898,8 @@ def init(cwd,
separate_git_dir = str(separate_git_dir)
command.append('--separate-git-dir={0}'.format(separate_git_dir))
if shared is not None:
if isinstance(shared, six.integer_types):
if isinstance(shared, six.integer_types) \
and not isinstance(shared, bool):
shared = '0' + str(shared)
elif not isinstance(shared, six.string_types):
# Using lower here because booleans would be capitalized when
Expand Down
6 changes: 6 additions & 0 deletions salt/states/saltmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,12 @@ def wait_for_event(
'''
ret = {'name': name, 'changes': {}, 'comment': '', 'result': False}

if __opts__.get('test'):
ret['comment'] = \
'Orchestration would wait for event \'{0}\''.format(name)
ret['result'] = None
return ret

sevent = salt.utils.event.get_event(
node,
__opts__['sock_dir'],
Expand Down