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,449 Commits 24 Branches 182 Tags 341 MiB
8e42384342
Commit Graph

94449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
0d7180a70e
Revert "Allow for not being prompted to supply a password to deploy keys to a…" 2018-08-30 16:22:29 -05:00
Daniel A. Wozniak
fc39dcf4e4
Simplify cli test fixes 2018-08-30 12:49:41 -07:00
rallytime
d1e51db8d3
Remove references to unused milestones in docs 2018-08-30 15:12:34 -04:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Nicole Thomas
0cda22e7a9
Merge pull request #49449 from rallytime/flaky-test 
Mark status test as flaky
 2018-08-30 14:10:43 -04:00
Nicole Thomas
bcc5f1a7c1
Merge pull request #49444 from rallytime/bp-49299 
Back-port #49299 to 2018.3.3
 2018-08-30 14:10:20 -04:00
Nicole Thomas
38713e2db9
Merge pull request #49448 from rallytime/bp-49400 
Back-port #49400 to 2018.3.3
 2018-08-30 14:04:28 -04:00
Nicole Thomas
d6ddcab351
Merge pull request #49446 from rallytime/bp-49356 
Back-port #49356 to 2018.3.3
 2018-08-30 14:04:00 -04:00
Nicole Thomas
1a67956c0f
Merge pull request #49445 from rallytime/bp-49192 
Back-port #49192 to 2018.3.3
 2018-08-30 14:03:44 -04:00
Nicole Thomas
33f59d44de
Merge pull request #49443 from rallytime/bp-49197 
Back-port #49197 to 2018.3.3
 2018-08-30 14:03:09 -04:00
Nicole Thomas
60758059c3
Merge pull request #49442 from rallytime/bp-49180 
Back-port #49180 and related fixes to 2018.3.3
 2018-08-30 14:02:53 -04:00
Nicole Thomas
1f4906346a
Merge pull request #49441 from rallytime/bp-49240 
Back-port #49240 to 2018.3.3
 2018-08-30 14:02:39 -04:00
Nicole Thomas
cc27b67a37
Merge pull request #49440 from rallytime/bp-49258 
Back-port #49258 to 2018.3.3
 2018-08-30 14:02:25 -04:00
Daniel A. Wozniak
ac3c379109
Fix up py3 git config tests 2018-08-30 11:02:00 -07:00
rallytime
0f322bb39f
Mark status test as flaky 2018-08-30 11:34:05 -04:00
rallytime
b953fe0079
Mark pillar refresh test as flaky 2018-08-30 11:24:33 -04:00
Daniel A. Wozniak
8022b0c3d6
Fix tests that use timed_subprocess for py3 2018-08-30 10:52:14 -04:00
Daniel A. Wozniak
20148d4438
Test fixes 
- Fix tearDown method to remove unicode environment key.
- Mark flaky test as such, test_set_system_time fails when run at
  certian times of the day.
 2018-08-30 10:50:41 -04:00
Daniel A. Wozniak
b8c5a5bb91
Fix string formatting wart in file state tests 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
19756022be
Fix wart in file state test 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
ba68388342
Work around cmd.run unicode issues in test for now 
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
5fe821978e
File state line ending fixes 2018-08-30 10:44:14 -04:00
Daniel A. Wozniak
e155568957
Fix typo 2018-08-30 10:40:10 -04:00
Daniel A. Wozniak
608a1ae7ba
Account for file renames 2018-08-30 10:39:42 -04:00
Daniel A. Wozniak
e8e6a46a2b
Fix directory unit test 2018-08-30 10:39:37 -04:00
Daniel A. Wozniak
2f865c398e
Fix is_windows checks 2018-08-30 10:39:32 -04:00
Daniel A. Wozniak
6460f7f217
Account for normalized dirs in unit tests 2018-08-30 10:39:28 -04:00
Daniel A. Wozniak
f4b7101a35
Simplify dict keys lookup 2018-08-30 10:39:15 -04:00
Daniel A. Wozniak
942b68bfc8
Fix remaining file state integration tests (py3) 2018-08-30 10:39:05 -04:00
Daniel A. Wozniak
22ed452479
Work around listdir encoding issues on py2 windows 2018-08-30 10:27:45 -04:00
Daniel A. Wozniak
f5be275835
file state test fixes 
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
 2018-08-30 10:27:45 -04:00
Nicole Thomas
c27fd188e4
Merge branch '2018.3' into fix_48661 2018-08-30 10:20:29 -04:00
Daniel Wallace
0191af1423
flaky tests are flaky yo 2018-08-30 10:18:13 -04:00
Daniel Wallace
720b671dda
mark orchestration state tests as flaky 2018-08-30 10:18:12 -04:00
Nicole Thomas
a962efc009
Merge pull request #49411 from terminalmage/issue49269-2018.3 
Allow our custom yaml dumper to NamespacedDictWrapper objects (2018.3 branch)
 2018-08-30 09:05:36 -04:00
Nicole Thomas
8022a3b494
Merge pull request #49407 from rallytime/pkg-flaky 
Mark pkg module tests and flaky
 2018-08-30 09:01:31 -04:00
Nicole Thomas
7f8c38a77e
Merge pull request #49406 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-08-30 09:00:33 -04:00
Nicole Thomas
7a166bc58a
Merge pull request #49376 from twangboy/fix_48608 
Fix issue with duplicates in user.list_users on OSX
 2018-08-30 08:57:54 -04:00
Nicole Thomas
03d97507f6
Merge pull request #49434 from dwoz/cleanup_exception_handling 
Clean up exception handling on py3
 2018-08-30 08:56:23 -04:00
Daniel Wallace
7099164fa8
Merge pull request #49389 from gtmanfred/2017.7 
make file envs compatible with fileclient formats
 2018-08-29 18:49:23 -05:00
twangboy
bf32e0ca1d
Merge branch 'fix_48608' of https://github.com/twangboy/salt into fix_48608 2018-08-29 16:41:58 -06:00
twangboy
fb97b00130
Fix broken path to libsodium tarball 2018-08-29 16:40:56 -06:00
twangboy
535d83e39e
Fix test for list_users 2018-08-29 16:39:10 -06:00
Daniel A. Wozniak
9daa992c6e
Fix group remove test logic 2018-08-29 15:22:41 -07:00
Daniel A. Wozniak
d74fab7703
Clean up exception handling on py3 2018-08-29 14:45:17 -07:00
Mike Place
24faa5e5ec
Merge pull request #49408 from terminalmage/issue49269 
Allow our custom yaml dumper to NamespacedDictWrapper objects
 2018-08-29 15:20:04 -06:00
Erik Johnson
a4cb35b7c5
Remove support for overriding the class name 
Nothing in Salt uses this now.
 2018-08-29 14:55:01 -05:00
Erik Johnson
82a8b731f0
Allow our custom yaml dumper to NamespacedDictWrapper objects 
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.

This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
 2018-08-29 14:50:23 -05:00
Erik Johnson
d02ec34790
Allow our custom yaml dumper to NamespacedDictWrapper objects 
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.

This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
 2018-08-29 14:43:10 -05:00
Daniel Wallace
6c01662665
remove cmd key from load 2018-08-29 13:59:00 -05:00