valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,233 Commits 24 Branches 182 Tags 341 MiB
045d81c9d3
Commit Graph

95233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Lafont
02e0ea0f99
lint fix 2018-10-23 10:28:35 -04:00
Nicolas Lafont
819c46cb87
fix lint errors and code factorization 2018-10-23 10:28:31 -04:00
Nicolas Lafont
8aa35989ab
Fix lint error 2018-10-23 10:28:27 -04:00
Nicolas Lafont
9092c4e1ee
Adding support for XCP-ng 2018-10-23 10:28:21 -04:00
Nicolas Lafont
c516bc5199
Adding XCP-ng to os family map 2018-10-23 10:28:16 -04:00
Nicole Thomas
9331f1e920
Merge pull request #50171 from terminalmage/docs 
Fix invalid RST link in docker_network docs
 2018-10-23 09:40:35 -04:00
Nicole Thomas
16eece35c7
Merge pull request #50161 from rmarcinik/patch-1 
Add a missing result for task.info
 2018-10-23 09:31:42 -04:00
Erik Johnson
7ea1d6cdd3
Fix invalid RST link in docker_network docs 2018-10-23 08:24:24 -05:00
Daniel Wallace
622bb51464
Merge pull request #50026 from damon-atkins/jenkins_pylint 
Jenkins CI Lint Improvements
 2018-10-22 15:49:15 -05:00
Rigel Marcinik
9848f0692a
Add a missing result for task.info 
There is a possible value for Last Run Result in the windows task scheduler that is missing from the results dictionary.  It raises a confusing KeyError from task.info if the task ends up in this state.
 2018-10-22 14:23:20 -05:00
Nicole Thomas
aa66d1b7ba
Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial 
[DOC] Fix JSON payload example in HTTP tutorial
 2018-10-22 14:37:51 -04:00
Denys Havrysh
fe2d70d4a3
[DOC] Fix JSON payload example in HTTP tutorial 2018-10-22 18:57:04 +03:00
Mike Place
28bc5e351f
Merge pull request #50136 from terminalmage/debug-logging 
Add some debug logging before and after states gather pillar data
 2018-10-22 08:40:38 -06:00
Mike Place
593c7ff085
Merge pull request #50147 from garethgreenaway/50129_network_get_route_fails_dash_in_name 
[2018.3] Fix to modules/network.py
 2018-10-22 08:31:02 -06:00
Mike Place
5c7a7d97aa
Merge pull request #50156 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-22 08:24:38 -06:00
rallytime
87e20fd9a0
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-22 10:15:39 -04:00
Damon Atkins
aebce88d82
Merge branch '2017.7' into jenkins_pylint 2018-10-23 00:35:54 +11:00
Daniel Wallace
ce375f4ac3
Merge pull request #50148 from MTecknology/proxmox-fixups 
Proxmox fixups
 2018-10-22 06:55:09 -05:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py 2018-10-21 08:39:29 -07:00
Damon Atkins
5f708fac39 use awk to create the other files, so git does not need to search again 2018-10-21 20:06:41 +11:00
Daniel Wallace
1a90c4fde2
Merge pull request #50144 from dwoz/winrm_fs_release 
Use newest winrm-fs release
 2018-10-20 19:53:36 -05:00
Michael Lustfield
49599475b1
Race condition still exists at one second timeout. 2018-10-20 19:27:58 -05:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05:00
Gareth J. Greenaway
311796994b
Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route. 2018-10-20 15:57:25 -07:00
Daniel A. Wozniak
0951d85433
Use newest winrm-fs release 2018-10-20 14:22:55 -07:00
Damon Atkins
6b96a24b97 Adjust jenkins linting process, only run stage if required, use git diff to find files, instead of find, report on status, changed and deleted files, lint only changed files. 2018-10-21 01:30:54 +11:00
Erik Johnson
8592a0b90e
Add some debug logging before and after states gather pillar data 
This will help definitively identify instances where a salt-call is
delayed because it is waiting for pillar data from the master.
 2018-10-19 15:09:50 -05:00
Daniel Wozniak
0ece06ef66
Merge pull request #50085 from dwoz/win_pkg_redux 
Fix `test_win_pkg` yet again
 2018-10-19 11:16:15 -07:00
Mike Place
0069247ddf
Merge pull request #49980 from twangboy/lgpo_add_printer_drivers 
Add support for AddPrinterDrivers
 2018-10-19 07:19:40 -06:00
Mike Place
de23c83f54
Merge pull request #50114 from rallytime/bp-50061 
Back-port #50061 to 2018.3
 2018-10-19 05:46:02 -06:00
Mike Place
9188bec831
Merge pull request #50115 from garethgreenaway/apply_49104_to_2018_3 
[2018.3] Apply scheduler fixes and tests from #49104 to 2018.3
 2018-10-19 05:45:30 -06:00
Mike Place
e892042a67
Merge pull request #50119 from terminalmage/boto-tests 
Squelch spurious errors logged in unit tests
 2018-10-19 05:42:30 -06:00
Mike Place
35449b4b14
Merge pull request #50120 from terminalmage/salt-jenkins-1137 
Fix bad merge conflict resolution
 2018-10-19 05:38:34 -06:00
Erik Johnson
91812ff510
Squelch spurious errors logged in unit tests 
We are getting errors in the LazyLoader because certain functions are
not present in the LazyDict due to being left out of the whitelist.
These don't cause the tests to fail, but they do result in a lot of
spurious errors in the test suite.
 2018-10-18 14:01:28 -05:00
Erik Johnson
1ddfd26e9f
Fix bad merge conflict resolution 
b98df6d was incorrectly merged forward into 2018.3 (or into develop,
before 2018.3 was branched). This causes failures to redeploy the thin
tarball when it has changed, under certain circumstances.

This commit fixes the problem. I'm also leaving in some changes to the
logging that I made in the course of troubleshooting this, as they make
the border between stdout and stderr more explicit, as well as adding
the shim command's retcode.
 2018-10-18 12:39:55 -05:00
Gareth J. Greenaway
adb1e79723
Apply scheduler fixes and tests from #49104 to 2018.3 2018-10-18 08:27:59 -07:00
Erik Johnson
1f09104b0d
Add unit test for pkg.install with epoch 2018-10-18 11:16:58 -04:00
zr
af253c6542
pkg.install bugfix 2018-10-18 11:15:42 -04:00
Mike Place
e0965603bf
Merge pull request #50113 from rallytime/bp-49989 
Back-port #49989 to 2017.7
 2018-10-18 17:14:22 +02:00
William Giokas
27c7ac94b7
Increase centos7-py2 kitchen pr timeout to 8 hours 
The centos7-py2 tests have been consistently failing to finish before
the timeout. I am increasing the timeout for these tests to 8 hours in
order to see if we can finish a few of them. They should get much closer
to finishing as the branch tests have been finishing at around the 6:30
or 7:00 mark sometimes.
 2018-10-18 11:11:59 -04:00
Mike Place
5123488dc2
Merge pull request #50013 from Giandom/2018.3 
Passed kwargs to db_exists in db_remove method
 2018-10-18 13:28:29 +02:00
Mike Place
f22630eacb
Merge branch '2018.3' into win_pkg_redux 2018-10-18 13:06:31 +02:00
Daniel A. Wozniak
0b033a645f
Do not allow age to be a negative number 2018-10-17 13:35:14 -07:00
Nicole Thomas
aa94f6009d
Merge pull request #50092 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-17 15:57:06 -04:00
Daniel Wozniak
4d9e2a0f16
Merge pull request #50088 from vulnbe/fix-incorrect-id-handling-2018-3-3 
Fix incorrect user/group id handling in file state
 2018-10-17 12:48:46 -07:00
Nicole Thomas
d1f2c5d47e
Merge pull request #50082 from garethgreenaway/50073_fixing_typo_boto_cloudfront 
[2018.3] Fixing a typo in the boto_cloudfront
 2018-10-17 15:34:59 -04:00
rallytime
8609064f30
Update old utils paths to use new paths 2018-10-17 10:24:26 -04:00
rallytime
a984ad8b3d
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-17 10:21:42 -04:00
Nicole Thomas
7ec3840d25
Merge pull request #49794 from twangboy/fix_groupadd_test 
Fix possible issue with test_groupadd
 2018-10-17 10:20:33 -04:00
Nicole Thomas
05bd2a0692
Merge pull request #50090 from garethgreenaway/fix_vault_sdb_runner_test 
[2018.3] Fix to utils/vault.py
 2018-10-17 09:57:29 -04:00