valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,821 Commits 24 Branches 182 Tags 341 MiB
a9daa92d73
Commit Graph

96821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
e9e2c4193d
Fix test=True for reg.present state 2018-07-31 14:23:30 -06:00
Nicole Thomas
950c1014aa
Merge pull request #48836 from dwoz/unicode_names_py2 
Fix unicode directory listing on py2
 2018-07-31 16:22:52 -04:00
Nicole Thomas
05f2d65de3
Merge pull request #48853 from rallytime/bp-48850 
Back-port #48850 to 2017.7
 2018-07-31 16:21:48 -04:00
Nicole Thomas
8a1285239a
Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed 
[2017.7] fixes to states/pkg.py
 2018-07-31 16:18:04 -04:00
Gareth J. Greenaway
3872cf29fa
Merge branch 'develop' into 44739_remove_mixin_deprecations 2018-07-31 13:13:13 -07:00
rallytime
3c33ee554a
Skip tests in integration.shell.test_master 
Related to https://github.com/saltstack/salt-jenkins/issues/378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
 2018-07-31 15:22:34 -04:00
Nicole Thomas
7fddbeaa13
Merge pull request #48842 from alexvasiu/dev/avasiu/fix_adapter_mode 
modules/nilrt_ip.py: Fix _get_adapter_mode
 2018-07-31 15:16:40 -04:00
Nicole Thomas
c8e69431ff
Merge pull request #47734 from OrlandoArcapix/Issue47689-pip-state-performance 
#47689 improve run-speed of pip package state
 2018-07-31 15:15:34 -04:00
Nicole Thomas
232db0a967
Merge pull request #48733 from mirceaulinic/ciscoconfparse-mod 
Add ciscoconfparse execution module for various text config mainipulations
 2018-07-31 15:13:28 -04:00
Nicole Thomas
b3267b3366
Merge pull request #48821 from rallytime/fluorine-deprecations-cloud 
[develop] Fluorine deprecations in cloud util (and related functions)
 2018-07-31 15:04:00 -04:00
Mike Place
4b3b7db32d
Merge pull request #48850 from rallytime/kill-master-test 
Skip tests in integration.shell.test_master
 2018-07-31 12:44:23 -06:00
rallytime
65123e92d0
Skip tests in integration.shell.test_master 
Related to https://github.com/saltstack/salt-jenkins/issues/378

This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.

These tests should be in their own, isolated run, rather than with
the rest of the test suite.
 2018-07-31 14:39:48 -04:00
Dmitry Teselkin
984b993a6d
Merge branch 'develop' into check-file-recv-max-size-early 2018-07-31 21:30:12 +03:00
Dmitry Teselkin
b148f7c3ad Fix unittests #2 2018-07-31 21:28:07 +03:00
Nicole Thomas
baf8c5784a
Merge pull request #48847 from terminalmage/issue48695 
Update file.blockreplace docs to reflect changed functionality
 2018-07-31 14:11:29 -04:00
Nicole Thomas
644a1f4ff8
Merge pull request #48587 from twangboy/fix_lgpo 
Fix lgpo issue on Py3
 2018-07-31 14:05:57 -04:00
Mircea Ulinic
0a258f753f Add __virtual_aliases__ to some NAPALM modules, and allow wider availability 2018-07-31 17:55:25 +00:00
Erik Johnson
e2bdf7fb92
Update file.blockreplace docs to reflect changed functionality 
See https://github.com/saltstack/salt/issues/48695#issuecomment-407414810
 2018-07-31 12:50:28 -05:00
Nicole Thomas
83a5b3cc47
Merge pull request #48844 from AVeenstra/fix-python3-incompatibility 
Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.
 2018-07-31 13:20:26 -04:00
Nicole Thomas
2bacc23481
Merge pull request #48796 from Ch3LL/remove_su 
Remove fake su used in integration tests
 2018-07-31 13:08:53 -04:00
Mircea Ulinic
fc000b8577 Allow peeringdb.clean_kwargs to fail doc tests 2018-07-31 16:52:40 +00:00
Gareth J. Greenaway
9b0f5dd212
Fixing identation, removing some unnecessary conditionals. 2018-07-31 09:46:06 -07:00
Gareth J. Greenaway
727964ab55
One last cleanup. 2018-07-31 09:46:05 -07: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
Gareth J. Greenaway
16fb6ae635
Make sure pkg.hold and pkg.unhold are available before running the test. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
998651102d
Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic. 2018-07-31 09:46:05 -07:00
Gareth J. Greenaway
0791b0a03c
FileGrepTestCase tests back to 2018.3 2018-07-31 09:33:58 -07:00
Gareth J. Greenaway
2e01c55e7e
Fixing a bug that prevents specifying wildcards for filenames. 2018-07-31 09:33:58 -07:00
Nicole Thomas
e818c752b3
Merge branch '2018.3' into mac_brew 2018-07-31 12:28:36 -04:00
Nicole Thomas
5f1141dc05
Merge branch '2018.3' into isbm-2018.3-smbios-bugfix 2018-07-31 12:28:01 -04:00
Daniel A. Wozniak
47e158b9f0
Optomize if statement 2018-07-31 09:26:13 -07:00
Nicole Thomas
0eb622fc72
Merge branch 'develop' into salt_utils_http_parse_cookie_header 2018-07-31 12:26:02 -04:00
Gareth J. Greenaway
c97e65e1ec
Fixing lint error on six import. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
18e73559b0
General cleanup of integration.logging.test_jid_logging test. Disabling for PY3. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
534b13ac15
Fixing lint issues 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
8f4d55666e
Updaitng runtests.py for logging tests. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
ca4dd6c873
Adding integration/logging to runtests.py 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
ee1ef37be0
Adding an integration test to test that JIDs will show up in the logs if it is included in the log format string. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
16172dc0bc
Documentation fix. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
cc14dff8a8
Adding information about log_fmt_jid to logging documentation 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
3b8a4eed17
Adding some notes to the Fluorine release notes. Adding the default format for log_fmt_jid. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
ffd1a8ab0f
Introduce "log_fmt_jid" and ensure we are passing opts to the RequestContext so we have control the format of what the JID will look like in the logs. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
286c3bd56e
Adding RequestContext to minion.py so we can get the JID logging in the minion logs as well. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
e28d7032c2
Adding utils/ctx.py for RequestContext 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
4856fe94bf
Pop the jid out of extra then add it to the logrecord. Swap out the import for logging to import the salt.log.setup to ensure that we're using the customized salt logging. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
1b595b9ecd
Current state. Almost works but JID is unavailable are seemingly random times. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
85475f32aa
Initial efforts to add jids in logs 2018-07-31 09:19:06 -07:00
Nicole Thomas
00d06bda76
Merge pull request #48689 from linoplt/fix_38310_pygit2_checkout_ext_pillar_remote_using_tag 
Fix ext_pillar remote checkout using tag (pygit2)
 2018-07-31 12:15:58 -04:00
Nicole Thomas
136ff6735a
Merge pull request #48662 from slaws/fix-retention-schedule-48637 
Excluding relative dirs in state.file.retention_schedule
 2018-07-31 12:15:08 -04:00
Nicole Thomas
5e14e36195
Merge pull request #48838 from sizgiyaev/fix-vault-policy-state 
Fixed: added additional return code 200 for succeeded vault api request
 2018-07-31 12:14:21 -04:00