Commit Graph

95776 Commits

Author SHA1 Message Date
Mike Place
7cb2405e48
Merge pull request #50690 from garethgreenaway/50016_ensure_path_is_str
[2018.3] fixes to augeas_cfg module
2018-11-30 11:44:41 -07:00
Damon Atkins
5936066e62 ensure archiveArtifacts are always collected. Use CHANGE_BRANCH to detect merge-forward 2018-11-30 23:36:07 +11:00
Jamie Bliss
0f7281598c
Merge branch '2017.7' into loader-exception-handler 2018-11-29 22:51:58 -05:00
Jamie Bliss
194801a982
Merge branch 'loader-exception-handler' of github.com:astronouth7303/salt into loader-exception-handler 2018-11-29 22:51:37 -05:00
Jamie Bliss
869774480d
Use single quotes per style guide 2018-11-29 22:51:29 -05:00
Jamie Bliss
1bdd49d43a
Add more links and write some system summaries 2018-11-29 22:49:39 -05:00
Gareth J. Greenaway
cec7cb4dc3
Older versions of python-augeas need the path passed to aug.match to be a string. 2018-11-29 11:50:45 -08:00
Ch3LL
d46aff05fc
Merge branch 2017.7 into 2018.3
Conflicts:
  - salt/modules/file.py
2018-11-29 13:09:15 -05:00
Mike Place
a5c7639ecb
Merge pull request #50657 from terminalmage/issue49392
Rewrite host.present state to allow for removal of entries not matching IP
2018-11-29 10:58:39 -07:00
Mike Place
d9e7be1091
Merge pull request #50670 from damon-atkins/jenkins_pylint
Corrections to ci/lint from #50583
2018-11-29 10:52:26 -07:00
Mike Place
b604785c53
Merge pull request #50683 from garethgreenaway/48759_adding_aliases_include_expand
[2018.3] Fixes to acme module when adding aliases to existing certificate
2018-11-29 10:46:53 -07:00
Gareth J. Greenaway
3940a0fa68
When adding alises to an existing Certbot certificate, if we see a message about expanding in the stderr returned from cmd.run_all we should rerun the cmd with --expand included. 2018-11-29 09:24:28 -08:00
Erik Johnson
a394cd76f6
Update file integration tests to use decorator for tempdirs 2018-11-29 09:29:23 -06:00
Damon Atkins
b6d1605f99 ci/lint corrected filenames and test condition on full lint
Also fix CODEOWNER team name
2018-11-29 23:44:11 +11:00
Jamie Bliss
bd3796a9c2
Update TOC 2018-11-28 18:20:46 -05:00
Jamie Bliss
3a9ab1b5f5
Merge dunders into developing, expand to cover all dunders. 2018-11-28 17:53:14 -05:00
Gareth J. Greenaway
6dc3afce17
Merge pull request #50672 from garethgreenaway/49691_file_replace_search_only_return_false
[2017.7] fixes to file.replace with search_only
2018-11-28 14:17:02 -08:00
Claudiu Popescu
31878d5aaf Pylint fixes 2018-11-28 23:20:51 +02:00
Jamie Bliss
dadeb0da0b
Merge branch '2017.7' into loader-exception-handler 2018-11-28 15:53:40 -05:00
Jamie Bliss
07868f1dfd
Improve logging output 2018-11-28 15:33:57 -05:00
Gareth J. Greenaway
7e7df06063
lint 2018-11-28 09:47:24 -08:00
Gareth J. Greenaway
6b73c7637f
When using file.replace, with the search_only option, if the pattern does not exist in the file then we should return False. 2018-11-28 09:47:24 -08:00
Erik Johnson
2ddb587e99
Add release notes for new "clean" option 2018-11-28 11:45:25 -06:00
Erik Johnson
e4946f9cec
Rename "remove" argument to "clean" 2018-11-28 11:41:48 -06:00
Mike Place
1236b519b4
Merge pull request #50659 from garethgreenaway/49954_gem_installed_less_than_greater_than_support
[2017.7] fixes to gem state when using greater than or less than versions
2018-11-28 10:38:59 -07:00
Daniel Wozniak
15f9ae4412
Merge pull request #50664 from garethgreenaway/50406_salt_ssh_returner_configuration
[2018.3] Fix to logic for configuring returners
2018-11-27 22:24:29 -07:00
Gareth J. Greenaway
35254116f3
When pulling values out of the available configuration for returners we should always default to using keys for those returners, eg. mongo.user for the username. Otherwise in certain situations, eg. when using salt-ssh we will end up with the wrong value for the user. 2018-11-27 18:44:11 -08:00
Gareth J. Greenaway
0ec8bcfd2f
When using the gem installed state, when passing a version that includes greater than or less than symbols, ensure that the installed versions meets that requirement. 2018-11-27 14:02:24 -08:00
Lex Vella
4ea93867e8
Merge branch '2018.3' into 2018.3 2018-11-27 16:32:43 -05:00
Erik Johnson
7fd3bcea47
Add remove parameter to host.present state 2018-11-27 15:13:29 -06:00
Erik Johnson
2671a30671
Add unit tests for host.present state 2018-11-27 15:13:29 -06:00
Erik Johnson
30f1b85c09
Remove non-matching IPs from hosts file 2018-11-27 15:13:29 -06:00
Erik Johnson
ec297a0944
Performance improvements in hosts module
Prevent additional unnecessary reads, etc.
2018-11-27 15:13:29 -06:00
Daniel Wozniak
afbcf031bb
Merge pull request #50652 from twangboy/fix_test_mac_utils
Fix `unit.utils.test_mac_utils` on Windows
2018-11-27 13:45:40 -07:00
Lex Vella
42e4ab3c53
Merge branch '2018.3' into 2018.3 2018-11-27 15:10:29 -05:00
Lex Vella
79f6b426ff
Check file_mode in file.directory and _check_directory 2018-11-27 15:08:27 -05:00
twangboy
c4cb729257
Fix path issues with the tests 2018-11-27 12:49:27 -07:00
Mike Place
6317f3a312
Merge pull request #50583 from damon-atkins/jenkins_pylint
Fix lint only changes, full lint on merge forwards
2018-11-27 11:26:32 -07:00
Erik Johnson
d1c2038081
Add generic ip address validation function 2018-11-27 11:55:54 -06:00
Erik Johnson
9f547205a0
Add ignore ability to process_read_exception 2018-11-27 11:45:01 -06:00
Jamie Bliss
d06739a647
Add short writeups for a bunch of systems. 2018-11-26 22:25:23 -05:00
Jamie Bliss
705e7e460f
Add a bunch of cross linking 2018-11-26 21:37:32 -05:00
Jamie Bliss
40f9b16530
Add missing module type sections 2018-11-26 21:22:57 -05:00
Jamie Bliss
172d8c2902
Refactor headings 2018-11-26 20:56:43 -05:00
Jamie Bliss
53154a0fe0
Oops, missed that 2018-11-26 20:43:40 -05:00
Jamie Bliss
0dcd3419af
Possible horrific use of toctrees? maybe 2018-11-26 20:02:46 -05:00
Jamie Bliss
bed35095be
Refactor, add a TOC 2018-11-26 19:48:58 -05:00
Jamie Bliss
f647c1d74c
Fill in some missing modules 2018-11-26 19:33:12 -05:00
Daniel Wozniak
15bf09aa0c
Merge pull request #50605 from Oloremo/fix-supervisord-dead-state-idempotency
Fixed the supervisord.dead state idempotency
2018-11-26 17:11:25 -07:00
Jamie Bliss
9d4b596055
Merge branch '2017.7' into loader-docs 2018-11-26 18:23:06 -05:00