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
77,476 Commits 24 Branches 182 Tags 341 MiB
b3582f7a62
Commit Graph

77476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roche, Damien
b3582f7a62 fixed lint issues 2017-01-24 15:19:36 +00:00
Roche, Damien
9191b22b2c Enhanced wait_for_successful_query with request_interval 2017-01-24 13:38:56 +00:00
Mike Place
5f456ec2ff Merge pull request #38898 from terminalmage/issue38878 
git.detached: rename ref to rev for consistency
 2017-01-23 19:02:35 -07:00
Mike Place
2ede44fe54 Merge pull request #38901 from stefano-pogliani/pillar_globs 
Apply glob pattern to file_roots and pillar_roots (master & minion).
 2017-01-23 18:35:02 -07:00
Stefano Pogliani
23468cbcd1 Apply glob pattern to file_roots and pillar_roots (master & minion). 
Implements #38736
 2017-01-23 23:30:34 +00:00
Erik Johnson
46aad90274 git.detached: rename ref to rev for consistency 
This deprecates the ref argument, adding a warning to the state return.
 2017-01-23 17:13:16 -06:00
Mike Place
88ec2d2ca4 Merge pull request #38716 from colinjkevans/fix_38318 
Fix for #38318
 2017-01-23 11:25:08 -07:00
Mike Place
e55cedf16f Merge pull request #38882 from gtmanfred/develop 
resolved_ips could be None
 2017-01-23 11:22:13 -07:00
Mike Place
afbbd2838a Merge pull request #38745 from vodik/fix-reconnect 
Fix salt-minion reconnection problem when master breaks connection
 2017-01-23 10:55:01 -07:00
Mike Place
fabc88cc0f Merge pull request #38824 from mcalmer/dockerng.build-add-buildargs 
add buildargs option to dockerng.build
 2017-01-23 10:27:47 -07:00
Daniel Wallace
a65442565d resolved_ips could be None 
Only run len() when we know that resolved_ips is a list.
 2017-01-23 10:41:37 -06:00
Mike Place
28018fd406 Merge pull request #38877 from The-Loeki/ssh-ipv6 
Salt-SSH client: Don't overwrite self.host w/IPv6 brackets
 2017-01-23 08:19:20 -07:00
Ronald van Zantvoort
f55df05e0d Don't overwrite self.host w/IPv6 brackets 2017-01-23 13:07:56 +01:00
Mike Place
3ffc343f95 Merge pull request #38846 from marcaurele/feature/cloudstack-securitygroups 
cloud: add security groups for node creation for cloudstack
 2017-01-20 15:40:42 -07:00
Marc-Aurèle Brothier
974f11a4ee cloudstack: add security groups for node creation 
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
 2017-01-20 22:18:36 +01:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-20 14:01:12 -07:00
Mike Place
86c0be597c Merge pull request #38779 from lomeroe/win_lgpo_ignore_badxml_admx_files 
win_lgpo handle errors when 'encoding="unicode"' exists in ADMX file
 2017-01-20 13:45:49 -07:00
Mike Place
12118fa4eb Merge pull request #38794 from markuskramerIgitt/develop 
Test availability of git in the command shell.
 2017-01-20 13:43:40 -07:00
Mike Place
7c32123b0f Merge pull request #38820 from twangboy/salt_perms_develop 
Remove `Users` from c:\salt
 2017-01-20 13:16:58 -07:00
Mike Place
5d126a2772 Merge pull request #38828 from eradman/pillarenv 
Extend support for pillarenv_from_saltenv to master config
 2017-01-20 12:15:02 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
Mike Place
850e8c0734 Merge pull request #38831 from The-Loeki/ssh-ipv6 
Salt-SSH deal with raw IPv6 addresses
 2017-01-20 11:38:31 -07:00
Mike Place
efe1bf10e8 Merge pull request #38832 from terminalmage/issue38711 
archive.extracted: Identify symlinks when checking for incorrect types
 2017-01-20 11:36:14 -07:00
Mike Place
0c3a01777e Merge pull request #38835 from UtahDave/cache_docs 
Cache docs
 2017-01-20 11:35:19 -07:00
rallytime
ce6d1b103d Make sure we're using the opts dict mocking in parsers_test 
The additional call to parser.parse_args(args) negates the first
patch to running self.config_func. We want the opts that we set
up in the above test to patch the setup args when the parse_args
func is called. This updates the mock to work with better with
patch and removes the additional parser.parse_args call.
 2017-01-20 10:20:51 -07:00
Erik Johnson
d10c068e25 Update archive state unit tests to reflect symlinks in archive.list 2017-01-20 08:49:40 -06:00
David Boucha
1d13dd971e add info about what is cached 2017-01-19 16:56:40 -07:00
David Boucha
6a07a8de00 fix config example 2017-01-19 15:56:40 -07:00
David Boucha
a643340632 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-01-19 15:53:22 -07:00
Erik Johnson
d6adfb6d12 Identify symlinks when looking for incorrect types 
Also, enforce ownership properly on both files and symlinks
 2017-01-19 15:49:55 -06:00
Ronald van Zantvoort
047fc51d8a Salt-SSH deal with raw IPv6 addresses 2017-01-19 21:07:35 +01:00
Mike Place
10a3d8b8dd Merge pull request #38726 from twangboy/vcredist 
Add VC Redist 2008 SP1 MFC to installer
 2017-01-19 12:13:41 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config 
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
 2017-01-19 13:34:33 -05:00
Erik Johnson
09b9e95f7c archive.list: organize symlinks separately from files in verbose mode 
Also fix an incorrect method for identifying symlinks
 2017-01-19 11:03:04 -06:00
Erik Johnson
e6483f096d Support removing symlinks in salt.utils.rm_rf 2017-01-19 10:47:43 -06:00
Michael Calmer
d9952484bd add buildargs option to dockerng.build 2017-01-19 15:41:25 +01:00
twangboy
11c3f103e3 Remove User from c:\salt 2017-01-18 17:35:11 -07:00
Mike Place
d489e05bd4 Merge pull request #38806 from isbm/isbm-systemd-service-files 
Add a salt-minion service control file
 2017-01-18 14:39:31 -07:00
Mike Place
d5f2d92a4e Merge pull request #38810 from UtahDave/fix_beacon_doc_zd1035 
Fix beacon doc
 2017-01-18 14:37:20 -07:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
Mike Place
88faf08a71 Merge pull request #38811 from techhat/sanvm 
Show a lot less data when requesting a VM
 2017-01-18 14:08:02 -07:00
Mike Place
d14f0c64eb Merge pull request #38812 from rallytime/pyobjects-test 
Update pyobjects test to be a list
 2017-01-18 14:06:00 -07:00
Mike Place
50f03f8057 Merge pull request #38813 from gtmanfred/2016.3 
catch SIGPIPE in vmware connection
 2017-01-18 14:05:41 -07:00
Daniel Wallace
ce3472cec2 catch SIGPIPE in vmware connection 2017-01-18 13:58:04 -06:00
Mike Place
23b8b47258 Merge pull request #38809 from twangboy/fix_hostname_2016.3 
Fix get_hostname to handle longer computer names
 2017-01-18 12:31:59 -07:00
rallytime
f3e84c1ab7 Update pyobjects test to be a list 
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
 2017-01-18 12:16:30 -07:00
Joseph Hall
47c19325cf Show a lot less data when requesting a VM 2017-01-18 12:13:23 -07:00
David Boucha
dbe9edb806 fix reactor example. 
This version is tested on 2016.11 branch and was found working
ZD 1035
 2017-01-18 11:46:34 -07:00
Colin Evans
3807e2c2d9 Fix test failure - change "set += list" to "set.update(list)" 2017-01-18 13:38:10 -05:00