valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,102 Commits 24 Branches 182 Tags 341 MiB
ac5e59e7bb
Commit Graph

99102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
ac5e59e7bb
Merge branch 'fluorine' into merge-fluorine 2018-11-26 09:03:19 -08:00
Mike Place
a8a952f60f
Merge pull request #50603 from terminalmage/fix-whitelist 
Remove no-longer-existant test module from whitelist.txt
 2018-11-23 06:12:43 -05:00
Mike Place
26f743f577
Merge pull request #50616 from cbosdo/fluorine-backport 
virt: ElementTree.tostring py3 fixes
 2018-11-22 12:08:31 -05:00
Cédric Bosdonnat
43fd329e5a
virt: fix ElementTree.tostring uses 
ElementTree.tostring returns a byte string, which is fine for python2,
but breaks on python3 with libvirt calls expecting a string.
 2018-11-22 17:45:58 +01:00
Erik Johnson
c312b57712
Remove no-longer-existant test module from whitelist.txt 
This was converted to unit tests in #50528. Since there are no unit
tests in the whitelist.txt, I've removed it rather than renaming.
 2018-11-21 08:35:18 -06:00
Erik Johnson
7f35838d9e
Fix docs breakage introduced in 28f1595 2018-11-21 07:40:17 -06:00
Erik Johnson
678a75b2a1
Merge remote-tracking branch 'upstream/2018.3' into fluorine 2018-11-21 07:31:51 -06:00
Erik Johnson
c9531d8c67
Merge pull request #50599 from terminalmage/merge-2018.3 
Merge Sphinx fixes from 2017.7 to 2018.3
 2018-11-21 07:31:17 -06:00
Erik Johnson
ba82b0748a
Merge remote-tracking branch 'upstream/2017.7' into merge-2018.3 2018-11-21 07:19:22 -06:00
Erik Johnson
1b8a8acbbb
Merge pull request #50592 from terminalmage/docs-2017.7 
Disable unused shorturls plugin (backport to 2017.7)
 2018-11-21 07:18:26 -06:00
Erik Johnson
db157766a0
Remove overline from section title 
This causes a warning on newer Sphinx releases
 2018-11-20 18:58:29 -06:00
Erik Johnson
8127dd5bb4
Disable unused shorturls plugin 
It was causing build errors when SPHINXOPTS=-W is used
 2018-11-20 18:21:25 -06:00
Daniel Wozniak
60b4622570
Merge pull request #50366 from jdsieci/2018.3-fix-issue50254 
2018.3 fix issue50254
 2018-11-20 13:31:29 -07:00
Mike Place
e86ea9c743
Merge pull request #50474 from kyuubii/gpg-trust-model 
Allow to specify used trustmodel in `gpg.verify`
 2018-11-20 10:21:24 -07:00
Mike Place
735c9f431b
Merge pull request #50580 from garethgreenaway/50155_artificatory_download_state_test_true 
[2018.3] Adding test=True to artifactory.download.
 2018-11-20 09:37:13 -07:00
Gareth J. Greenaway
7dd57d0352
Lint. 2018-11-19 16:49:20 -08:00
Gareth J. Greenaway
3661ee071a
Adding test=True to artifactory.download. 2018-11-19 16:42:11 -08:00
Mike Place
766a332e38
Merge pull request #50571 from garethgreenaway/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-11-19 14:31:50 -07:00
Mike Place
015834ded9
Merge pull request #50577 from garethgreenaway/bp-50397 
Back-port PR #50397 to 2018.3
 2018-11-19 14:28:41 -07:00
Thomas Lemarchand
dd2d8725db
Documentation 2018-11-19 12:16:48 -08:00
Thomas Lemarchand
af6d21f772
Import unicode_literals from future and add versionadded tag 2018-11-19 12:16:42 -08:00
Thomas Lemarchand
09dc09d88d
Disable powershell modules list 
Add list_kbs function
 2018-11-19 12:16:35 -08:00
Thomas Lemarchand
05852d0865
pchanges to changes 
named parameters
 2018-11-19 12:16:27 -08:00
Thomas Lemarchand
16525e4312
Add Win WUSA management, to install Windows Update files (.msu). 
Fixes #46292
 2018-11-19 12:16:10 -08:00
Erik Johnson
12e0d80271
Merge pull request #50570 from garethgreenaway/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-11-19 14:04:04 -06:00
Gareth J. Greenaway
5cf6a1400d
Merge branch '2018.3' into merge-fluorine 2018-11-19 10:48:06 -08:00
Gareth J. Greenaway
4c85119a57
merge-forward 2017.7 to 2018.3 2018-11-19 10:39:38 -08:00
Gareth J. Greenaway
6fba83c294
Merge pull request #50519 from garethgreenaway/50266_core_virtual_grain_fixes 
[2018.3] Fix to virtual core grain
 2018-11-16 15:42:17 -08:00
Gareth J. Greenaway
dcae2f08c4
Merge branch '2018.3' into 50266_core_virtual_grain_fixes 2018-11-16 14:48:33 -08:00
Mike Place
fa2dda85a7
Merge pull request #50508 from damon-atkins/win_pkg_min_repo 
Set Windows winrepo_cache_expire_min improve performance for windows package processing
 2018-11-16 12:40:21 -07:00
Daniel Wozniak
02238a7c0b
Merge pull request #50520 from dwoz/issue_50459 
Always set .gitconfig dir to user's home
 2018-11-16 10:27:45 -07:00
Erik Johnson
84edd6269e
Merge pull request #50427 from sathieu/bp-git_pillar_tests 
Backports git_pillar tests improvements to 2018.3
 2018-11-16 10:37:28 -06:00
Damon Atkins
a049cf4128
Merge branch 'fluorine' into win_pkg_min_repo 2018-11-17 01:45:50 +11:00
Megan Wilhite
edd97384d3
Merge pull request #50532 from dubb-b/2017.7 
Adding tag to ec2 cloud tests
 2018-11-16 09:30:54 -05:00
Damon Atkins
00ef561a9d update minion.rst with winrepo_cache_expire_min new default 2018-11-17 01:25:47 +11:00
Mathieu Parent
12ea1cc01e
git_pillar: Add tests for mountpoint parameter 
(cherry picked from commit 6e2f4e471d08fcc29ce144af6dcd605b85644522)
 2018-11-16 06:07:24 +01:00
Mathieu Parent
fce467e438
git_pillar: Add tests for root parameter 
(cherry picked from commit 2e88b74816)
 2018-11-16 06:07:24 +01:00
Mathieu Parent
ba150a5182
Don't fail on git_pillar tests when destructive tests are not enable 
This fixes the following when running `python tests/runtests.py --ext-pillar`:

 --------  Tests with Errors  ------------------------------------------------------------------------------------------------------------------------
   -> tearDownClass (integration.pillar.test_git_pillar.TestGitPythonSSH)  ...........................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
   -> tearDownClass (integration.pillar.test_git_pillar.TestPygit2SSH)  ..............................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
 -----------------------------------------------------------------------------------------------------------------------------------------------------

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
(cherry picked from commit 84e9fce9bb)
 2018-11-16 06:07:22 +01:00
Nicole Thomas
4fcc9277dd
Merge pull request #50528 from twangboy/fix_test_nacl 
Fix `modules.test_nacl` on Py3
 2018-11-15 18:04:50 -05:00
Nicole Thomas
46514818a5
Merge pull request #50530 from terminalmage/salt-jenkins-1209 
Enable proxy/ssh daemons when filename mapping causes those tests to be run
 2018-11-15 18:03:05 -05:00
Brett Benassi
009e52d4b9
Adding tag to ec2 cloud tests 2018-11-15 15:36:05 -07:00
Erik Johnson
fbee11dadc
Enable proxy/ssh daemons when filename mapping causes those tests to be run 
The proxy and ssh tests won't run when the `--proxy` and `--ssh` CLI
flags, respectively, aren't passed to runtests.py. This ensures that we
start the daemons when the file mapping logic triggers them to be run.
 2018-11-15 16:26:05 -06:00
twangboy
30cf8664b0
Fix some lint 2018-11-15 14:52:54 -07:00
twangboy
1650881989
Fix tets_nacl on Py3 
Move the nacl tests from integration to unit
 2018-11-15 13:20:39 -07:00
Daniel A. Wozniak
1aa2e3466f
Simplifie and portable homedir lookup 2018-11-15 11:51:36 -07:00
Daniel A. Wozniak
f14f7470d9
Fix windows home dir lookup 2018-11-15 11:46:53 -07:00
Gareth J. Greenaway
4f30611c69
lint 2018-11-15 10:31:30 -08:00
Gareth J. Greenaway
4f9eb95d7f
Fixing a typo in the _virtual function, should be checking for existing grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particular Oracle Linux. 2018-11-15 10:31:30 -08:00
Nicole Thomas
6c07ba47ba
Merge pull request #50526 from terminalmage/issue50224 
Work around augeas' lack of unicode support
 2018-11-15 12:33:25 -05:00
Erik Johnson
ee246eda6c
Work around augeas' lack of unicode support 2018-11-15 10:31:14 -06:00