Thomas Jackson
fbaf02c596
Have per-job minions_remaining
2015-03-23 12:14:27 -07:00
Mike Place
3a5f36dc32
Deep copy opts
...
Fixes bug with highstate routing file client asymetrically
2015-03-23 11:51:57 -06:00
jfindlay
ba083a657d
Merge pull request #21872 from borgstrom/issue-21796-2014.7
...
Remove _locals from the final exec call in pyobjects (2014.7)
2015-03-21 11:04:30 -06:00
Evan Borgstrom
3223a15f83
This fixes #21796
...
From the Python docs on the exec statement:
> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.
We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 07:58:14 -07:00
Shane Lee
af01dc7ca5
Merge pull request #21861 from twangboy/build
...
Final (hopefully) improvements to the new build structure
2015-03-20 13:19:32 -07:00
Shane Lee
febef7eb78
Update salt-cp.bat
2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c
Added batchfiles to mimick the behavior of the exe's
2015-03-20 14:12:48 -06:00
twangboy
81025d8388
Fixed version parameter
2015-03-20 13:50:56 -06:00
twangboy
db64bef89c
Updated BuildSalt and Salt-Minion-Setup.nsi
...
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
2015-03-20 13:48:08 -06:00
Shane Lee
86037bbc4c
Merge pull request #21854 from jfindlay/bp-21791
...
backport #21791 to 2014.7
2015-03-20 12:44:24 -07:00
Thomas S Hatch
9da5b3342b
Merge pull request #21857 from jfindlay/bp-21844
...
backport #21844 to 2014.7
2015-03-20 13:22:59 -06:00
twangboy
fbec10071a
Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat
2015-03-20 13:19:44 -06:00
twangboy
98944e9842
Added file to slim the windows install
2015-03-20 13:18:37 -06:00
Nicole Thomas
54b32db78d
Merge pull request #21855 from rallytime/bp-21841
...
Backport #21841 to 2014.7
2015-03-20 13:15:33 -06:00
Nicole Thomas
c3c108d4b7
Merge pull request #21851 from rallytime/bp-20781
...
Backport the fix in #20781 manually to the 2014.7 branch
2015-03-20 12:56:31 -06:00
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
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
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
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
Justin Findlay
ddbe16e002
propagate original IOError message through file.manage_file
...
related to #21774
2015-03-20 09:12:38 -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
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
f92fd17d46
Merge pull request #21822 from basepi/bp-21820
...
[2014.7] Backport #21820 to 2014.7
2015-03-19 14:39:21 -06:00
Colton Myers
06c3cf8fc1
Make changes in both MultiSyndic and Syndic
2015-03-19 13:54:22 -06: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
Colton Myers
46c097389c
Add syndic_jid_forward_cache_hwm configuration
2015-03-19 13:26:57 -06:00
Colton Myers
36192e3d40
Fix Syndic to only forward unforwarded loads
2015-03-19 13:26:57 -06:00
Nicole Thomas
737ebb4ff6
Merge pull request #21818 from basepi/bp-21781
...
[2014.7] Backport #21781 to 2014.7
2015-03-19 13:24:23 -06:00
Colton Myers
e386db2c34
Update syndic_config test for new cachedir
2015-03-19 11:33:09 -06:00
Colton Myers
8d406c1642
Fix syndic to get the load for __load__, not the jid
...
Fixes #21495
2015-03-19 11:33:08 -06:00
Colton Myers
d40b3874c5
Fix syndic to use master cachedir
2015-03-19 11:33:08 -06:00
