valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,689 Commits 24 Branches 182 Tags 341 MiB
58e16a0d39
Commit Graph

77689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
6430a45196 Merge pull request #38851 from terminalmage/docker-py-2.0 
Support docker-py 2.0 in dockerng
 2017-01-23 09:48:11 -07:00
Joseph Hall
67bc4d6687 Don't require text_out path to exist 2017-01-23 09:47:54 -07:00
Mike Place
ec59ae67c8 Merge pull request #38859 from alxwr/2016.11 
fix parsing of sockstat -4
 2017-01-23 09:47:22 -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
5fe6db6201 Merge pull request #38850 from techhat/stripcache 
Strip .p from cache file names
 2017-01-23 09:28:45 -07: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
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
Joseph Hall
109cb62e76 Remove .p from test 2017-01-20 20:22:57 -07: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
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Erik Johnson
3c061b21fe Support docker-py 2.0 in dockerng 
docker-py 2.0 has renamed ``docker.Client()`` to ``docker.APIClient()``
 2017-01-20 16:31:45 -06:00
Joseph Hall
534aa3f527 Strip .p from cache file names 2017-01-20 15:27:09 -07:00
Erik Johnson
e40fac589a Catch MinionError in file.source_list 
Resolves #38825.
 2017-01-20 15:23:04 -06: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
ac8008d843 Merge pull request #38844 from cachedout/http_memory_leak 
Fix memory leak in HTTP client
 2017-01-20 13:59:13 -07:00
Mike Place
c46bf85518
Fix memory leak in HTTP client 
Credit to Damien Vandenbossche and Thomas Lemarchand @tlemarchand for discovery and fix.
 2017-01-20 13:57:28 -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
4913c4f90c Merge pull request #38819 from twangboy/salt_perms_2016.11 
Remove `Users` from c:\salt [DO NOT MERGE FORWARD]
 2017-01-20 13:17:35 -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
dfe6dfe963 Merge pull request #38823 from gtmanfred/2016.3 
pass pillar to compound matcher in match module
 2017-01-20 12:19:09 -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
Mike Place
a04ab86da1 Merge pull request #38833 from Ch3LL/add_release_notes_2016.3.5 
add 2016.3.5 changelog to release notes
 2017-01-19 16:27:25 -07:00
Ch3LL
374dc1ab88 skip 2016.3.5 due to :doc: references 2017-01-19 16:14:22 -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
Ch3LL
31f324c4ff add 2016.3.5 changelog to release notes 2017-01-19 15:43:28 -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
Daniel Wallace
f0a71e8707 pass pillar to compound matcher in match module 2017-01-19 08:45:50 -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
twangboy
eb04ed7eef Remove User from c:\salt 2017-01-18 17:32:55 -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