valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,494 Commits 24 Branches 182 Tags 341 MiB
b6afdae7c9
Commit Graph

94494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wozniak
74b78835b3
Merge pull request #49347 from Ch3LL/bp_49345_2018.3.3 
[2018.3.3] Backport #49345
 2018-08-27 18:53:59 -07:00
Daniel Wozniak
b9fa7db67e
Merge branch '2017.7' into windows_pr_builds 2018-08-27 18:51:28 -07:00
Daniel Wozniak
d8f2945813
Merge pull request #49344 from cachedout/test_matcher_flaky 
Matcher test marked flaky
 2018-08-27 18:50:35 -07:00
Daniel Wozniak
f08e7208af
Merge pull request #49353 from dwoz/boto_fix 
Do not raise exception if passed bytes
 2018-08-27 18:49:02 -07:00
Daniel Wozniak
4690ad00a7
Merge pull request #49339 from dwoz/more_tests 
[2017.7] Backport whitelist.txt additions
 2018-08-27 18:40:18 -07:00
Daniel Wozniak
d50324b4b5
Merge branch '2017.7' into more_tests 2018-08-27 16:30:10 -07:00
Daniel A. Wozniak
376019ff18
Do not raise exception if passed bytes 2018-08-27 16:21:52 -07:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart 2018-08-27 14:36:40 -07:00
Daniel Wallace
7bf5ba83c8
upgrade including linux kernels 
This is required for ubuntu 14.04 to pass.
 2018-08-27 15:11:13 -04:00
Daniel Wallace
ce2733ef9a
upgrade including linux kernels 
This is required for ubuntu 14.04 to pass.
 2018-08-27 15:07:56 -04:00
Mike Place
77f5fd3af9
Merge branch '2017.7' into windows_pr_builds 2018-08-27 12:09:02 -06:00
Mike Place
a34ef2e54d
Matcher test marked flaky 2018-08-27 10:56:55 -06:00
Daniel Wallace
e371ad99eb
Merge pull request #49341 from terminalmage/issue48717 
Update dynamic git_pillar docs to enclose env name in quotes
 2018-08-27 10:21:37 -05:00
Erik Johnson
1971d09ad6
Update dynamic git_pillar docs to enclose env name in quotes 2018-08-27 09:42:33 -05:00
Daniel Wallace
00b58ee438
Merge pull request #49337 from dwoz/win_service_test_fix 
Fix broken service stop test
 2018-08-27 09:22:37 -05:00
Anthony Arnaud
13e1a1730c
Merge branch '2018.3' into fix-etcd-cache 2018-08-27 09:42:12 -04:00
Daniel A. Wozniak
b9c344b7ce
Fix module.archive tests for win py3 2018-08-27 00:44:41 -07:00
Daniel A. Wozniak
ac60fb8190
Comment strange code 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
5fefd6fe89
Simplify cli test fixes 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
1765d53367
Fix archive tests on Windows platform 2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
06f271ff19
Add archive module tests to whitelist.txt 2018-08-27 00:44:39 -07:00
Daniel A. Wozniak
9cb8fe28c5
Add more tests to whitelist for windows 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
bc971e419e
add doc tests 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
8899a5ee1a
Add more client tests to whitelist 2018-08-27 00:44:37 -07:00
Daniel A. Wozniak
14cd7b4830
Add cli tests to whitelist 2018-08-27 00:44:37 -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
2733c02b0a
Use double quotes on windows commands 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 Wozniak
81428eddcd
Merge pull request #49291 from dwoz/dedent 
Add dedent that sets line endings
 2018-08-26 23:55:58 -07:00
Daniel A. Wozniak
1c1727e8fd
Fix broken service stop test 2018-08-26 18:34:47 -07:00
Erik Johnson
2d8055e151
Merge pull request #49336 from terminalmage/issue48299 
Fix half-baked comment
 2018-08-26 19:07:54 -05:00
Erik Johnson
175e161d9c
Fix half-baked comment 2018-08-26 19:06:14 -05:00
Daniel A. Wozniak
19911987b7
Fix review nits 2018-08-26 17:03:16 -07:00
Daniel Wozniak
a2e7033f33
Merge pull request #49331 from dwoz/strfix 
Use salt.utils to ensure string type
 2018-08-25 18:42:07 -07:00
Daniel Wallace
1fd5cf10e4
Merge pull request #49320 from rallytime/fix-48694 
Update documentation for #48694 and add deprecation warning
 2018-08-25 14:56:18 -05:00
Daniel Wallace
d70eda8954
Merge pull request #49312 from Ch3LL/ssh_list_hosts 
Fix keyerror in manage.bootstrap
 2018-08-25 14:55:43 -05:00
Daniel Wallace
6b2eba7381
Merge pull request #49316 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-08-25 14:53:04 -05:00
Daniel Wallace
be6691d91b
Merge pull request #49323 from Ch3LL/skip_git 
Skip nonexistent branch test for git versions <1.7.10
 2018-08-25 14:52:47 -05:00
Daniel A Wozniak
7513474f71
Use salt.utils to ensure string type 2018-08-25 12:19:59 -07:00
Daniel Wozniak
5766e982e7
Merge pull request #49322 from dwoz/state_module_test_fix 
Encode shell commands explicitly.
 2018-08-24 21:43:26 -07:00
Daniel Wozniak
b47da0aff7
Merge pull request #49299 from dwoz/test_fix 
Work around cmd.run unicode issues in test for now
 2018-08-24 21:43:02 -07:00
Daniel A. Wozniak
7cdba27c2b
Add ci scripts for windows PR builds 2018-08-24 16:09:40 -07:00
Ch3LL
ee3d32f74e
Skip nonexistent branch for git versions <1.7.10 2018-08-24 18:11:32 -04:00
Daniel A. Wozniak
1f7d50d194
Encode shell commands explicitly. 
On Windows subprocess.Popen will try to implicity encode shell commands
using the default system encoding. This will raise an exception if
passed utf-8.
 2018-08-24 14:27:02 -07:00
Nicole Thomas
64d7b0e4c6
Merge pull request #49313 from rallytime/bp-49236 
Back-port #49236 to 2018.3.3
 2018-08-24 16:59:15 -04:00
Daniel Wallace
c323096846
Merge pull request #49314 from rallytime/bp-49277 
Back-port #49277 to 2017.7
 2018-08-24 14:52:14 -05:00
Daniel A. Wozniak
f4bd644a4b
Fix string formatting wart in file state tests 2018-08-24 12:09:37 -07:00
rallytime
0964b5eba1
Update documentation for #48694 and add deprecation warning 
There was a behavior change when using `salt-run cache.grains` beginning
with the 2017.7.5 release.

The behavior change happened in PR #45588, which was back-ported to the
2017.7 branch in PR #45751. This was done in order to fix the bug reported
in #45489.

In order to be helpful to users, a deprecation warning was added. If ``tgt``
is not passed, no grains will be listed. Instead of suddenly requiring a ``tgt``
argument in a dot release, let's keep this optional arg around until Sodium.

When Salt Sodium is released, we can remove the warning and change ``tgt`` to be
a mandatory argument.

Fixes the last parts of #48694.
 2018-08-24 15:08:43 -04:00
rallytime
39c442ca1c
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - tests/integration/states/test_file.py
 2018-08-24 14:08:30 -04:00