valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,449 Commits 24 Branches 182 Tags 341 MiB
72f1fff7a3
Commit Graph

38449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
72f1fff7a3 Remove unused import 2015-03-24 17:26:50 -06:00
rallytime
15680cdbb2 Apply nested outputter optimization fix to 2014.7 2015-03-24 16:51:00 -06:00
jfindlay
4eb759f775 Merge pull request #21946 from cro/defaults_clarification 
Clarify how defaults are indicated in the config files.
 2015-03-24 14:16:19 -06:00
C. R. Oldham
a35f38a71e Clarify how defaults are indicated in the config files. 2015-03-24 12:27:51 -06:00
Nicole Thomas
dfb794bdc7 Merge pull request #21941 from thatch45/load_base_name 
Add a seperate loader base name path to multimaster
 2015-03-24 12:25:02 -06:00
C. R. Oldham
5dbb0d433d Clarify how defaults are indicated in the config files. 2015-03-24 12:10:01 -06:00
Thomas S Hatch
78fc0f8799 Add a seperate loader base name path to multimaster 2015-03-24 10:12:01 -06:00
Thomas S Hatch
278d293321 Merge pull request #21926 from jfindlay/fix_net 
fix network.iface module related stack traces
 2015-03-23 21:37:53 -06:00
Justin Findlay
a16039c5f1 fix network.iface module related stack traces 2015-03-23 20:57:51 -06:00
Thomas S Hatch
d3e14e51b0 Merge pull request #21921 from jfindlay/net_arp 
config gate net.arp on presence of arp
 2015-03-23 19:25:54 -06:00
Thomas S Hatch
fadf44c202 Merge pull request #21811 from jacksontj/2014.7 
Re-work timeouts in saltnado
 2015-03-23 19:22:22 -06:00
jfindlay
334a7b8b4f Merge pull request #21918 from rallytime/bp-21885 
Backport #21885 to 2014.7
 2015-03-23 19:19:07 -06:00
Justin Findlay
958bf0979c config gate net.arp on presence of arp 2015-03-23 17:02:27 -06:00
Matt Willsher
78747b5d87 Remove check for physical virt type for KVM 
KVM can run in VMs when VT-x is passed through the VM, as can be done on VMWare Fusion, and Workstation, perhaps even KVM itself.
 2015-03-23 16:00:25 -06:00
Nicole Thomas
e07220d529 Merge pull request #21901 from cachedout/deepcopy_opts 
Deep copy opts
 2015-03-23 15:56:03 -06:00
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