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
77,669 Commits 24 Branches 182 Tags 341 MiB
78fccdc7e2
Commit Graph

77669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NLR
78fccdc7e2 Cast to list in case tags is a tuple. 2017-08-02 17:57:41 +02:00
NLR
287b57b5c5 Fix RabbitMQ tags not properly set. 2017-08-02 17:50:02 +02:00
Mike Place
f2b0c9b4fa Merge pull request #42574 from sbojarski/boto-cfn-error-reporting 
Fixed error reporting in "boto_cfn.present" function.
 2017-08-01 12:55:29 -05:00
Mike Place
bc1effc4f2 Merge pull request #42623 from terminalmage/fix-unicode-constructor 
Fix unicode constructor in custom YAML loader
 2017-07-31 14:25:17 -05:00
Erik Johnson
fcf45889dd Fix unicode constructor in custom YAML loader 
2e7f743 added this in the wrong place, it should not have been added
within the if block since we will _always_ want this constructor
available.
 2017-07-28 15:35:30 -05:00
Slawomir Bojarski
5c945f10c2 Fix debug message in "boto_cfn._validate" function. 2017-07-28 12:57:10 -04:00
Slawomir Bojarski
181a1beecc Fixed error reporting in "boto_cfn.present" function. 
Fixes #41433
 2017-07-28 12:56:49 -04:00
Nicole Thomas
cbf752cd73 Merge pull request #42515 from gtmanfred/backslash 
Allow not interpreting backslashes in the repl
 2017-07-28 10:00:08 -06:00
garethgreenaway
549495831f Merge pull request #42586 from gdubroeucq/2016.11 
[Fix] yumpkg.py: add option to the command "check-update"
 2017-07-27 16:51:59 -07:00
Nicole Thomas
6b45debf28 Merge pull request #41988 from redmatter/fix-dockerng-network-matching 
Fix dockerng.network_* name matching
 2017-07-27 15:25:06 -06:00
Daniel Wallace
cc4e45656d Allow not interpreting backslashes in the repl 
Without this, if append or prepend is used with file.replace, the backslashes
will not be interpreted when appending the file, but the next time the state is
run, the backslashes could be interpreted and removed from the line.
 2017-07-27 14:21:58 -06:00
Nicole Thomas
4b16109122 Merge pull request #42339 from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 
Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125)
 2017-07-27 13:05:50 -06:00
Nicole Thomas
6c5a7c604a Merge pull request #42077 from vutny/fix-jobs-scheduled-with-whens 
Fix scheduled job run on Master if `when` parameter is a list
 2017-07-27 13:04:22 -06:00
Mike Place
f9cb536589 Merge pull request #42414 from vutny/unify-hash-params-format 
DOCS: unify hash sum with hash type format
 2017-07-27 13:48:40 -05:00
Mike Place
535c922511 Merge pull request #42523 from rallytime/fix-42375 
Add a mention of the True/False returns with __virtual__()
 2017-07-27 13:13:06 -05:00
Mike Place
0df0e7e749 Merge pull request #42527 from twangboy/win_wua 
Document changes to Windows Update in Windows 10/Server 2016
 2017-07-27 12:45:37 -05:00
Mike Place
0373791f2a Correct capatlization 2017-07-27 11:45:29 -06:00
Mike Place
69b06586da Merge pull request #42551 from binocvlar/fix-lack-of-align-check-output 
Remove '-s' (--script) argument to parted within align_check function
 2017-07-27 12:35:31 -05:00
Mike Place
9c0b5cc1d6 Remove extra newline 2017-07-27 10:59:07 -06:00
Nicole Thomas
9e0b4e9faf Merge pull request #42573 from rallytime/bp-42433 
Back-port #42433 to 2016.11
 2017-07-27 07:51:21 -06:00
Guillaume DUBROEUCQ
d2ef4483e4 yumpkg.py: clean 2017-07-27 15:07:10 +02:00
Guillaume DUBROEUCQ
a96f7c09e0 yumpkg.py: add option to the command "check-update" 2017-07-27 14:34:56 +02:00
C. R. Oldham
e931ed2517 Merge pull request #42571 from twangboy/win_add_pythonpath 
Avoid loading system PYTHON* environment vars
 2017-07-26 16:48:55 -06:00
twangboy
d55a44dd1a Avoid loading user site packages 2017-07-26 14:21:41 -06:00
Erik Johnson
0293429e24 Only force saltenv/pillarenv to be a string when not None 
This fixes a regression introduced to make numeric saltenv/pillarenv
work properly.
 2017-07-26 13:58:31 -06:00
twangboy
9af1eb2741 Ignore any PYTHON* environment vars already on the system 2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95 Add pythonpath to batch files and service 2017-07-26 12:21:14 -06:00
Richard Phillis
c4fabaa192 Remove '-s' (--script) argument to parted within align_check function 
The -s argument results in no stdout output from parted in this context,
so the user must infer success or failure from the exit status.
 2017-07-26 09:15:59 +10:00
Mike Place
de2f397041 Merge pull request #42387 from DSRCorporation/bugs/42371_KeyError_WeakValueDict 
Fix race condition in usage of weakvaluedict
 2017-07-25 15:57:42 -05:00
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -06:00
Mike Place
641a9d7efd Merge pull request #41968 from root360-AndreasUlm/fix-rabbitmqctl-output-handler 
Fix rabbitmqctl output sanitizer for version 3.6.10
 2017-07-25 14:12:36 -05:00
Mike Place
66fede378a Merge pull request #42479 from gtmanfred/interface 
validate ssh_interface for ec2
 2017-07-25 13:37:18 -05:00
Mike Place
a925c7029a Merge pull request #42516 from rallytime/fix-42405 
Add info about top file to pillar walk-through example to include edit.vim
 2017-07-25 12:01:12 -05:00
twangboy
af3bcc927b Document changes to Windows Update in 10/2016 2017-07-24 14:34:09 -06:00
rallytime
fa466519c4 Add a mention of the True/False returns with __virtual__() 
And their relationship to `__virtualname__`.

Fixes #42375
 2017-07-24 13:58:16 -06:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim 
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
 2017-07-24 12:17:41 -06:00
Daniel Wallace
c32c1b2803 fix pylint 2017-07-24 11:31:25 -06:00
Nicole Thomas
1bd5bbccc2 Merge pull request #42509 from clem-compilatio/fix-42417 
Fix _assign_floating_ips in openstack.py
 2017-07-24 11:14:12 -06:00
clem-compilatio
72924b06b8 Fix _assign_floating_ips in openstack.py 
Fixes #42417
In salt/cloud/clouds/openstack.py :
- _assign_floating_ips() should not raise SaltCloudSystemExit() just yet.
- Instead, it should let _query_node_data() a chance to get the IP from node['public_ips'].
 2017-07-24 16:59:19 +02:00
Mike Place
4bf35a74de Merge pull request #42464 from garethgreenaway/2016_11_remove_tmp_identity_file 
[2016.11] Small fix to modules/git.py
 2017-07-21 16:28:56 -05:00
Daniel Wallace
99ec634c6b validate ssh_interface for ec2 
and default to public_ips
 2017-07-21 15:19:31 -06:00
Gareth J. Greenaway
ff24102d51 Uncomment the line that removes the temporary identity file. 2017-07-21 10:01:55 -07:00
Nicole Thomas
e2120dbd0e Merge pull request #42443 from garethgreenaway/42357_pass_args_kwargs_correctly 
[2016.11] Fix to slack engine
 2017-07-21 09:48:56 -06:00
Nicole Thomas
8262cc9054 Merge pull request #42200 from shengis/sqlite3_fix_row_absent_2016.11 
Fix #42198
 2017-07-21 08:47:29 -06:00
Gareth J. Greenaway
635810b3e3 Updating the slack engine in 2016.11 to pass the args and kwrags correctly to LocalClient 2017-07-20 16:50:42 -07:00
Mike Place
d9df97e5a3 Merge pull request #42424 from goten4/2016.11 
Fix error message when tornado or pycurl is not installed
 2017-07-20 16:53:40 -05:00
Emmanuel Bouton
1c0574d05e Fix error message when tornado or pycurl is not installed 2017-07-20 17:01:10 +02:00
Mike Place
42bb1a64ca Merge pull request #42350 from twangboy/win_fix_ver_grains_2016.11 
Fixes problem with Version and OS Release related grains on certain versions of Python (2016.11)
 2017-07-19 12:07:25 -05:00
Mike Place
0a72e56f6b Merge pull request #42356 from meaksh/2016.11-AliasesLoader-wrapper-fix 
Allow to check whether a function is available on the AliasesLoader wrapper
 2017-07-19 11:56:41 -05:00
Mike Place
10eb7b7a79 Merge pull request #42368 from twangboy/win_fix_build_2016.11 
Remove build and dist directories before install (2016.11)
 2017-07-19 11:47:27 -05:00