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,061 Commits 24 Branches 182 Tags 341 MiB
5cf6a1400d
Commit Graph

99061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
5cf6a1400d
Merge branch '2018.3' into merge-fluorine 2018-11-19 10:48:06 -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
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
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
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
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
Nicole Thomas
0327ea0469
Merge pull request #50522 from cbosdo/fluorine-backport 
Test and fix disk creation in virt.init
 2018-11-15 09:48:06 -05:00
Nicole Thomas
a8ca8f71ba
Merge pull request #50512 from Ch3LL/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-11-15 09:38:42 -05:00
Damon Atkins
828990c248 typo 2018-11-15 21:10:24 +11:00
Cédric Bosdonnat
0786123d03
Test and fix disk creation in virt.init 
Adding a test case in virt.init uncovered a few issues: a passed
exception that we really want to report to the user, and disks that
were not created.
 2018-11-15 10:57:30 +01:00
Nicole Thomas
d83da51d8b
Merge pull request #50503 from terminalmage/2018.3-docs 
Set jenkins docs job to treat any warnings as errors (2018.3 branch)
 2018-11-14 14:30:23 -05:00
Nicole Thomas
9c24fb6373
Merge pull request #50498 from terminalmage/fluorine-docs 
Fix docs build warnings in fluorine
 2018-11-14 14:27:06 -05:00
Gareth J. Greenaway
fa2f4a5595
Merge pull request #50514 from bornwitbugs/load_beacon_fix 
Load beacon fix
 2018-11-14 11:20:32 -08:00
Erik Johnson
1d39f88301
Make fluorine docs use the latest available release for download links 2018-11-14 12:45:05 -06:00
bornwitbugs
e59ced6507
Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix 2018-11-14 17:54:37 +00:00
Nicole Thomas
a50377be29
Merge pull request #50509 from Ch3LL/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-11-14 12:52:05 -05:00
Ch3LL
8501581f27
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/utils/mac_utils.py
  - salt/utils/win_runas.py
  - tests/support/case.py
 2018-11-14 12:38:16 -05:00
Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3 
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py
 2018-11-14 10:33:44 -05:00
Damon Atkins
28f1595473 update windows min package defintion setting 2018-11-15 01:38:16 +11:00
Nicole Thomas
55b4914644
Merge pull request #50502 from twangboy/lgpo_2018.3 
Add definition for RestrictRemoteSAM
 2018-11-14 09:30:37 -05:00
Erik Johnson
ae96e29032
Fix docs configuration for renamed logstash engine 2018-11-13 19:05:29 -06:00
Erik Johnson
a4fc1087a3
Fix docs configuration for renamed logstash engine 2018-11-13 19:04:46 -06:00
Nicole Thomas
9e63cde7c5
Merge pull request #50472 from cbosdo/fluorine-backport 
Fix virt.update for NICs mac and model
 2018-11-13 16:17:30 -05:00
Erik Johnson
5b064646f7
Set docs jenkins job to treat warnings as errors 2018-11-13 15:01:10 -06:00
Erik Johnson
9b6c6697ea
Update docs references for states with func_alias 2018-11-13 15:01:10 -06:00
Erik Johnson
3adcfacc8b
Set docs jenkins job to treat warnings as errors 2018-11-13 14:59:51 -06:00
Erik Johnson
d7a31803b7
Update docs references for states with func_alias 2018-11-13 14:59:51 -06:00
Erik Johnson
06be9d2896
Disable custom sphinx automodule 
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
 2018-11-13 14:53:13 -06:00
Erik Johnson
62b5d400b6
Disable custom sphinx automodule 
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
 2018-11-13 14:51:12 -06:00
twangboy
fe92a3a506
Add definition for RestrictRemoteSAM 2018-11-13 13:14:58 -07:00
Mike Place
c1dde7e9b1
Merge pull request #50328 from rallytime/fix-48734 
Fix issue with salt-run jobs.list_jobs where Target: unknown-target
 2018-11-13 12:49:57 -07:00
Daniel Wozniak
351faeb952
Merge pull request #50499 from dwoz/build_fix 
Fix 2018.3 build
 2018-11-13 11:46:54 -07:00
Daniel A. Wozniak
5754b4a7c6
Fix 2018.3 build 2018-11-13 11:33:26 -07:00
Mike Place
6f4b23f689
Merge pull request #50496 from terminalmage/2018.3-docs 
Fix 2018.3 docs build warnings
 2018-11-13 10:21:08 -07:00
Erik Johnson
ee835b10bc
Fix fluorine docs build warnings 2018-11-13 11:10:11 -06:00
Nicole Thomas
c00fd43ee9
Merge pull request #50493 from rallytime/bp-50362 
Back-port #50362 to 2017.7
 2018-11-13 11:59:50 -05:00
Nicole Thomas
6b272c1d65
Merge pull request #50492 from rallytime/bp-50228-and-50443 
Back-port #50228 and #50443 to 2018.3
 2018-11-13 11:59:14 -05:00