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
98,553 Commits 24 Branches 182 Tags 341 MiB
a46f9c3dcd
Commit Graph

327 Commits

Author SHA1 Message Date
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Daniel A. Wozniak
df5e27156e
Add spm tests for windows 2018-10-04 15:43:50 -07:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
 2018-10-02 15:09:51 -04:00
Daniel A. Wozniak
7ce1b645c0
Use utf-8 encoding for salt-runtests.log 2018-09-28 13:08:37 -07:00
rallytime
7e0db5cb15
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-09-25 15:18:00 -04:00
Daniel A. Wozniak
536fce611f
Increase function timeout 2018-09-20 09:30:17 -06:00
Daniel A. Wozniak
1f60753a47
Do not use close_fds on Windows OS 2018-09-19 19:07:41 -06:00
Daniel A. Wozniak
1757eddae1
Increase ModuleTest.run_function timeout 
Reduce flakyness with greater timeout
 2018-09-19 11:21:12 -06:00
rallytime
17d0a878fa
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/whitelist.txt
 2018-09-18 10:11:34 -04:00
Daniel A. Wozniak
10ec8beb39
Fix linter issues 2018-09-10 10:00:25 -07:00
Daniel A Wozniak
ccbcb5588a
Add more tests to whitelist for Windows 2018-09-10 09:34:27 -07:00
rallytime
4d4922863b
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/runners/cache.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-08-30 14:39:48 -04:00
rallytime
ab6cc1c741
Update old utils paths to use new paths 2018-08-28 11:41:38 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/ext/win_inet_pton.py
  - salt/pillar/git_pillar.py
  - tests/integration/cli/test_batch.py
  - tests/integration/modules/test_archive.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/states/test_file.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-08-28 11:22:47 -04:00
Daniel Wozniak
d50324b4b5
Merge branch '2017.7' into more_tests 2018-08-27 16:30:10 -07:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart 2018-08-27 14:36:40 -07:00
Daniel A Wozniak
3e55d10584
Platform module doesn't exist in 2017.7 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
0394ece642
The set command does not work like inline env vars 
Remove set command prefix on windows since it can not be run inline with
other commands.
 2018-08-27 00:44:35 -07:00
Daniel A. Wozniak
19911987b7
Fix review nits 2018-08-26 17:03:16 -07:00
Daniel A. Wozniak
907b46d9f6
The set command does not work like inline env vars 
Remove set command prefix on windows since it can not be run inline with
other commands.
 2018-08-26 00:31:25 -07:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts 
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
 2018-08-24 10:46:50 -07:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions 2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings 2018-08-24 09:35:00 -07:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it 2018-08-23 13:08:04 -04:00
Erik Johnson
80dcb44a0d
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine 
Conflicts:
- salt/utils/mac_utils.py
- tests/unit/config/test_config.py
- tests/unit/loader/test_globals.py
- tests/unit/ssh/test_ssh.py
- tests/unit/templates/test_jinja.py
- tests/unit/utils/vmware/test_host.py
- tests/unit/utils/vmware/test_license.py
 2018-08-17 07:52:59 -05:00
Erik Johnson
8bda1e5ae3
Merge pull request #49091 from terminalmage/rename-test-files 
Rename/re-organize test files in 2018.3 branch
 2018-08-17 07:26:43 -05:00
Erik Johnson
ec258e235d
Add integration tests for yaml and json filters 2018-08-14 17:02:17 -05:00
Erik Johnson
fa76cb6ada
Move inspectlib tests to conform with naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
81e38239fe
Move shared kernelpkg test cases to tests/support/ 2018-08-14 13:53:29 -05:00
rallytime
6e6091c3ba
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/runners/test_cache.py
  - tests/support/case.py
 2018-08-14 09:57:37 -04:00
Nicole Thomas
90c2f026b3
Merge pull request #49077 from rallytime/bp-49075 
Back-port #49075 to 2018.3
 2018-08-13 15:59:59 -04:00
Nicole Thomas
0e1ed7b923
Merge pull request #49055 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-13 15:20:10 -04:00
Daniel Wallace
5e07b8306b
fix last async issue 2018-08-13 12:25:49 -04:00
Daniel Wallace
53c7ca16fb
fix last async issue 2018-08-13 10:23:00 -05:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - 	doc/man/salt.7
  - 	doc/ref/configuration/minion.rst
  - 	salt/cloud/clouds/ec2.py
  - 	salt/returners/highstate_return.py
  - 	tests/support/gitfs.py
  - 	tests/unit/loader/test_loader.py
 2018-08-10 13:12:14 -04:00
Bo Maryniuk
47078a300f Remove async keyword, moving it into the kwargs. 2018-08-10 15:59:24 +02:00
Bo Maryniuk
31dccc4fdf fix unicode literals 2018-08-10 15:59:24 +02:00
Bo Maryniuk
6cf400bfc9 Remove async keyword, moving it into the kwargs. 2018-08-09 18:13:13 +02:00
Bo Maryniuk
d4450707f7 fix unicode literals 2018-08-09 18:12:47 +02:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
Nicole Thomas
a9daa92d73
Merge pull request #47621 from dwoz/win_runas 
Runas any user even when shell is limited like winrm
 2018-08-05 14:29:50 -04:00
Daniel A. Wozniak
ff781617e7
Runas any user even when shell is limited 
- Fix runas when running under powershell remoting
- Support for LOCAL SERVICE and NETWORK SERVICE system accounts.
- Runas can now use system accounts from salt-call.
  (SYSTEM, LOCAL SERVICE and NETWORK SERVICE)
- Runas can launch processes on behalf of users without a password.
- Integration tests for win_runas module
 2018-08-03 12:32:28 -07:00
rallytime
a8b30fed9f
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/nilrt_ip.py
  - salt/states/pip_state.py
  - tests/unit/modules/test_file.py
 2018-08-03 09:27:20 -04:00
rallytime
15bfba7143
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/slsutil.py
  - salt/modules/win_timezone.py
  - salt/states/pkg.py
  - tests/integration/states/test_pkg.py
 2018-07-31 18:18:58 -04:00
Gareth J. Greenaway
11cb86e6eb
General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name. 2018-07-31 09:46:05 -07:00
rallytime
6177d6e3c1
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/client/__init__.py
  - salt/grains/core.py
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_file.py
  - tests/unit/roster/test_sshconfig.py
 2018-06-25 11:26:25 -04:00
Nicole Thomas
27a0e95174
Merge pull request #48279 from terminalmage/mock_open-docs 
Add documentation/further enhancements to rewritten mock_open
 2018-06-25 09:12:29 -04:00
Erik Johnson
3b6356f4b0
Raise TypeError when trying to read from filehandles not opened for reading 2018-06-23 21:27:58 -05:00
Erik Johnson
0e8c83bac6
2 MockFH enhancements: 
1. Raise appropriate TypeErrors when wrong type is written
2. Don't raise exception about read_data unless we actually try to read
   from the filehandle. This makes it a bit more permissive when testing
   code where the file is only being written to.
 2018-06-23 15:00:26 -05:00