valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,466 Commits 24 Branches 182 Tags 341 MiB
960a7c8764
Commit Graph

46466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
ca33da7082 Merge pull request #21852 from jfindlay/bp-21790 
backport #21790 to 2014.7
 2015-03-20 12:35:31 -06:00
Johan van den Dorpe
4fe795f66c Always check other OS release files if lsb_distrib_id grain not populated from /etc/lsb-release 
Fixes #19953
 2015-03-20 12:21:32 -06:00
Bo Maryniuk
ebc2f3c565 Added forgotten import 2015-03-20 19:00:34 +01:00
Erik Johnson
791959080c Don't run os.listdir in every loop iteration 
Use the cached_pkgs variable instead so you only run it once.
 2015-03-20 13:00:04 -05:00
Nicole Thomas
000c55d6a7 Merge pull request #6 from terminalmage/bp-21841 
deepcopy the PER_REMOTE_PARAMS global
 2015-03-20 11:58:03 -06:00
Colton Myers
2abb999fca Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/saltutil.py
 2015-03-20 11:56:39 -06:00
Colton Myers
d89d8f5d2d Add the trailing slash 2015-03-20 11:55:45 -06:00
Erik Johnson
565fcea388 deepcopy the PER_REMOTE_PARAMS global 
This keeps it from being modified if override_params is appended to
after it is assigned the value of PER_REMOTE_PARAMS.
 2015-03-20 12:55:40 -05:00
rallytime
0fb810a2e1 Don't forget to import SaltClientError 2015-03-20 11:54:11 -06:00
Nicolas Delaby
a6d8105d76 override_params contains the real list of allowed parameters 
Ease debugging when using pygit2
 2015-03-20 11:46:46 -06:00
Nicole Thomas
c27692cdab Merge pull request #21848 from rallytime/bp-21635 
Backport #21635 to 2014.7
 2015-03-20 11:36:21 -06:00
Nicole Thomas
8262d85998 Merge pull request #21849 from basepi/saltutil.runner.21650 
[2014.7] saltutil.runner fixes
 2015-03-20 11:36:02 -06:00
twangboy
ced2e57165 Added files for the New Portable Salt Installer 2015-03-20 11:25:13 -06:00
rallytime
ba0560e526 Backport the fix in #20781 manually to the 2014.7 branch 2015-03-20 11:21:10 -06:00
Colton Myers
4eee083691 Reorder mocked arguments 2015-03-20 10:36:25 -06:00
Mike Place
82299ed0c1 Merge pull request #21846 from rallytime/bp-21795 
Backport #21795 to 2014.7
 2015-03-20 10:35:01 -06:00
Mike Place
c1ef044c92 Merge pull request #21847 from rallytime/bp-21832 
Backport #21832 to 2014.7
 2015-03-20 10:34:51 -06:00
Colton Myers
3f0b003c7a Generate master config if it's not present 2015-03-20 10:28:48 -06:00
Justin Findlay
c0f041410a check for ssh key comment 
Fixes #21603.
 2015-03-20 10:28:28 -06:00
Thomas S Hatch
fd3623d9fc Merge pull request #21826 from jfindlay/file_error 
propagate original IOError message through file.manage_file
 2015-03-20 10:25:58 -06:00
Colton Myers
4e881bbfec Clean the __pub kwargs for saltutil.runner 2015-03-20 10:14:40 -06:00
Mike Place
3782251ac6 Revert regression caused by #15848 2015-03-20 10:12:55 -06:00
Mike Place
56142ad080 Avoid dueling opts with fileclients in highstate 
Closes #19332
 2015-03-20 10:11:10 -06:00
Bo Maryniuk
74b80d2d99 Lintfix 2015-03-20 16:29:41 +01:00
Bo Maryniuk
f0d80913fe Support inspection of modified files in Yum 2015-03-20 16:27:00 +01:00
Bo Maryniuk
de8beded77 Support inspection of modified files in Zypper 2015-03-20 16:24:38 +01:00
Bo Maryniuk
5085c22c63 Added inspection of modified files 2015-03-20 16:22:37 +01:00
Erik Johnson
a0aa3d16f5 Modifications to salt.modules.yumpkg.download 
This fixes some double-quote usage, and also makes the following
fixes/modifications:

1) Instead of using "rm -f" with a glob (which won't work with
   python_shell=False anyway), use actual python logic.

2) Remove unnecessary extra level in return dict.

3) Change CommandExecutionError to the more-accurate SaltInvocationError
   when the function is invoked without any arguments.

4) Adds a versionadded RST directive to denote the fact that this
   function is new in 2015.2.0.
 2015-03-20 10:14:44 -05:00
Justin Findlay
ddbe16e002 propagate original IOError message through file.manage_file 
related to #21774
 2015-03-20 09:12:38 -06:00
Mike Place
77078ce1cf Merge pull request #21832 from cachedout/mm_fix 
Revert regression caused by #15848
 2015-03-20 08:49:44 -06:00
Thomas S Hatch
b373c3f7f7 Merge pull request #21827 from basepi/syndic.tag.handling.21775 
[2015.2] Fix syndic tag handling for MoM
 2015-03-19 17:14:44 -06:00
Mike Place
3fba5a270c Revert regression caused by #15848 2015-03-19 16:52:43 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
 2015-03-19 16:03:29 -06:00
Colton Myers
5292f5d68d Merge pull request #21828 from basepi/append_21818 
[2014.7] Append #21818
 2015-03-19 16:00:35 -06:00
Colton Myers
417e2ab79b Stupid backport didn't get this 2015-03-19 15:59:49 -06:00
Colton Myers
2fd6025f05 Use the new tags_regex for get_returns_no_block 2015-03-19 15:41:15 -06:00
Colton Myers
b1eb709a07 Change get_returns_no_block to use regex 2015-03-19 15:40:53 -06:00
Thomas S Hatch
f20cfb6794 Merge pull request #21821 from basepi/bp-21813 
[2014.7] Backport #21813 to 2014.7
 2015-03-19 15:36:17 -06:00
Thomas S Hatch
7bbff8cc3f Merge pull request #21823 from isbm/isbm-yum-pkg-diff-to-2015.2 
Backport #21819 to 2015.2
 2015-03-19 15:12:25 -06:00
Thomas S Hatch
f92fd17d46 Merge pull request #21822 from basepi/bp-21820 
[2014.7] Backport #21820 to 2014.7
 2015-03-19 14:39:21 -06:00
Thomas S Hatch
167865540c Merge pull request #21820 from basepi/more.syndic.fixes 
[2015.2] syndic load fix
 2015-03-19 14:18:41 -06:00
Thomas S Hatch
5c67180ebe Merge pull request #21813 from basepi/syndic.load.caching 
[2015.2] Syndic should only forward load once per job
 2015-03-19 14:14:03 -06:00
Colton Myers
06c3cf8fc1 Make changes in both MultiSyndic and Syndic 2015-03-19 13:54:22 -06:00
Bo Maryniuk
88677d53ea Add diff support for YUM 2015-03-19 20:30:53 +01:00
Bo Maryniuk
6a7a063488 Add package download support for YUM 2015-03-19 20:30:42 +01:00
Colton Myers
3870c666f3 Pass in the load you just checked for 
Should fix the remaining job cache syndic issues
 2015-03-19 13:29:10 -06:00
Colton Myers
07c354bd27 Rearrange a little 2015-03-19 13:26:57 -06:00
Colton Myers
9cd3438cf4 Gate the correct function call. *facepalm* 2015-03-19 13:26:57 -06:00
Colton Myers
e7258ffbcd Add another comment 2015-03-19 13:26:57 -06:00
Colton Myers
30f9d08aa8 Pop oldest jid if we hit the jid_forward_cache_hwm 2015-03-19 13:26:57 -06:00