Ch3LL
|
d8288a0ffc
|
add unicode type for syslog test for tag
|
2018-07-13 12:39:09 -04:00 |
|
Ch3LL
|
17e69382d5
|
Fix python2 syslog returner expecting string bytes not unicode
|
2018-07-13 12:35:41 -04:00 |
|
rallytime
|
f9b8c4b257
|
Use () when using with_tempfile decorator in tests
|
2018-07-12 09:48:40 -04:00 |
|
rallytime
|
d3190ca0c0
|
Update old utils paths to new utils paths
|
2018-07-11 14:52:54 -04:00 |
|
rallytime
|
29b05ffdd1
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- doc/man/salt-api.1
- doc/man/salt-call.1
- doc/man/salt-cloud.1
- doc/man/salt-cp.1
- doc/man/salt-key.1
- doc/man/salt-master.1
- doc/man/salt-minion.1
- doc/man/salt-proxy.1
- doc/man/salt-run.1
- doc/man/salt-ssh.1
- doc/man/salt-syndic.1
- doc/man/salt-unity.1
- doc/man/salt.1
- doc/man/salt.7
- doc/man/spm.1
- pkg/windows/req.txt
- tests/integration/runners/test_state.py
- tests/integration/states/test_file.py
- tests/integration/states/test_npm.py
|
2018-07-11 14:49:27 -04:00 |
|
Nicole Thomas
|
ad5a959ab9
|
Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong
[2017.7] reset file_roots for renderers after compile_pillar
|
2018-07-11 09:13:45 -04:00 |
|
Nicole Thomas
|
5a0b274bf1
|
Merge pull request #48389 from garethgreenaway/48277_2018_3_file_roots_wrong
[2018.3] reset file_roots for renderers after compile_pillar
|
2018-07-11 09:13:32 -04:00 |
|
Daniel Wallace
|
9ba0f6b3a0
|
pin pm and grunt packages for npm tests
Until at least ubuntu 14 is dead.
|
2018-07-10 15:03:18 -05:00 |
|
Nicole Thomas
|
16d3daab3c
|
Merge pull request #48375 from Ch3LL/file_copy
Add user and group to makedirs cmd in file.copy
|
2018-07-10 08:35:10 -04:00 |
|
Ch3LL
|
d16a790775
|
Add mode to _makedirs call in file.copy
|
2018-07-09 15:47:37 -04:00 |
|
rallytime
|
54341d1a8d
|
Update old utils paths to use new utils paths
|
2018-07-09 10:34:38 -04:00 |
|
rallytime
|
68aabff0cf
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- pkg/windows/req.txt
- salt/netapi/rest_tornado/saltnado.py
- salt/utils/versions.py
- tests/integration/states/test_file.py
|
2018-07-09 10:27:58 -04:00 |
|
Daniel Wozniak
|
5ca5e060b3
|
Merge branch '2018.3' into test_git
|
2018-07-06 12:11:53 -07:00 |
|
Nicole Thomas
|
a9dc758e73
|
Merge pull request #48398 from garethgreenaway/48336_ensure_chmodd_setuid_with_chown
[2018.3] fixes to module/file.py
|
2018-07-06 14:02:42 -04:00 |
|
Nicole Thomas
|
acf42864aa
|
Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_chmod_setuid_with_chown
[2017.7] fixes to module/file.py
|
2018-07-06 14:02:29 -04:00 |
|
Nicole Thomas
|
2baa7f189f
|
Merge pull request #48431 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2018-07-05 13:22:59 -04:00 |
|
slivik
|
70144bccbb
|
Fixes dry run in ini_manage + Fixes related bug - when working with options which are not in section. + Fixes related tests + Fixes pylint warnings
|
2018-07-04 09:19:36 +02:00 |
|
Nicole Thomas
|
a7e52f0de2
|
Merge pull request #48429 from rallytime/bp-46824
Back-port #46824 to 2017.7
|
2018-07-03 17:45:36 -04:00 |
|
Daniel A. Wozniak
|
349a2b279e
|
Prepend test needs file.touch method
|
2018-07-03 13:32:02 -07:00 |
|
rallytime
|
3e59dda0b1
|
Merge branch '2017.7' into '2018.3'
No conflicts.
|
2018-07-03 16:09:28 -04:00 |
|
Beorn Facchini
|
8b4486248d
|
Added ignore_retcode to mock unit tests
|
2018-07-03 16:05:04 -04:00 |
|
Nicole Thomas
|
422441505d
|
Merge pull request #48422 from rallytime/fix-48230
Allow file.managed to work with uppercase source_hash in test=true mode
|
2018-07-03 12:40:58 -04:00 |
|
Nicole Thomas
|
83e387c951
|
Merge pull request #48410 from dwoz/service_dead_test_fix
Fix service dead test on windows
|
2018-07-03 10:17:28 -04:00 |
|
rallytime
|
4c691ac57a
|
Add regression test for Issue #48230
This also tests the fix for issue #38914
|
2018-07-02 16:56:49 -04:00 |
|
Daniel A. Wozniak
|
5c0923448d
|
Fix service dead test on windows
|
2018-07-02 12:03:03 -07:00 |
|
Gareth J. Greenaway
|
4b492fa633
|
Removing unused start_time variable from test_orchestration_with_pillar_dot_items test.
|
2018-07-02 11:55:46 -07:00 |
|
Gareth J. Greenaway
|
30c5855d20
|
Fixing a few things in the new test.
|
2018-07-02 11:55:46 -07:00 |
|
Gareth J. Greenaway
|
36b7253418
|
Fixing lint issue
|
2018-07-02 11:55:46 -07:00 |
|
Gareth J. Greenaway
|
ab6abfad31
|
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.
|
2018-07-02 11:55:46 -07:00 |
|
Daniel A. Wozniak
|
9c7085b70f
|
Fix file state prepend test
|
2018-07-02 11:30:55 -07:00 |
|
Gareth J. Greenaway
|
6f11da35a7
|
Fixing a few things in the new test.
|
2018-07-02 11:20:35 -07:00 |
|
Gareth J. Greenaway
|
cf747b14ec
|
Fixing lint issue
|
2018-07-02 11:20:35 -07:00 |
|
Gareth J. Greenaway
|
16d36c79c8
|
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.
|
2018-07-02 11:20:35 -07:00 |
|
Daniel Wozniak
|
10e93bff7f
|
Merge pull request #48396 from dwoz/symlink_test_fix
Fix file.symlink state test for windows
|
2018-07-02 11:10:31 -07:00 |
|
Nicole Thomas
|
5b38019ca0
|
Merge pull request #48339 from terminalmage/backport-tojson-filter
Backport tojson filter from #48309 to 2018.3
|
2018-07-02 13:52:52 -04:00 |
|
Gareth J. Greenaway
|
8efd33320f
|
Normalize the mode before we compare it.
|
2018-07-02 09:11:42 -07:00 |
|
Gareth J. Greenaway
|
2454652914
|
Normalize the mode before we compare it.
|
2018-07-02 09:06:22 -07:00 |
|
Gareth J. Greenaway
|
08ad5665de
|
Fixing test to ensure it works under py3
|
2018-07-02 08:51:55 -07:00 |
|
Nicole Thomas
|
d3c658bdcf
|
Merge pull request #48358 from Ch3LL/m2crypto_fix
Fix corrupt public key with m2crypto python3
|
2018-07-02 09:10:31 -04:00 |
|
Gareth J. Greenaway
|
f894f0ecb8
|
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group.
|
2018-07-01 12:33:10 -07:00 |
|
Gareth J. Greenaway
|
2b25d8c95b
|
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group.
|
2018-07-01 12:19:48 -07:00 |
|
Daniel A. Wozniak
|
d3456d31e6
|
Fix file.symlink state test for windows
|
2018-06-30 15:44:58 -07:00 |
|
rallytime
|
c4fd2a0930
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- salt/modules/rabbitmq.py
- tests/integration/modules/test_pip.py
|
2018-06-30 09:33:21 -04:00 |
|
Nicole Thomas
|
89857ea8b9
|
Merge pull request #48297 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2018-06-30 08:57:34 -04:00 |
|
Ch3LL
|
8fdd34d430
|
m2crypto open file in rb mode for pub key
|
2018-06-29 14:43:06 -04:00 |
|
twangboy
|
77629f640a
|
Fix module unit tests
|
2018-06-29 11:15:23 -06:00 |
|
Ch3LL
|
2cbcb4fd26
|
Add user and group to makedirs cmd in file.copy
|
2018-06-29 10:39:02 -04:00 |
|
Daniel A. Wozniak
|
e8362adf71
|
fopen does not support encoding
|
2018-06-28 10:16:52 -07:00 |
|
Ch3LL
|
a964db4663
|
Fix corrupt public key with m2crypto python3
|
2018-06-28 11:31:21 -04:00 |
|
Daniel A. Wozniak
|
487161ba8f
|
Fix file encoding on windows
|
2018-06-27 18:33:18 -07:00 |
|