Gareth J. Greenaway
|
0f15796484
|
Merge branch '2018.3' into merge-2018.3
Conflicts:
salt/utils/schedule.py
|
2018-11-26 11:43:51 -08:00 |
|
Gareth J. Greenaway
|
9f422b2a06
|
Moving the minion_blackout code to the start of the try...except. Adding a test to ensure we get a log.exception when minion_blackout is True.
|
2018-11-21 14:29:45 -08:00 |
|
rallytime
|
7dc1e770c4
|
Merge branch '2018.3' into 'develop'
Conflicts:
- doc/topics/installation/freebsd.rst
- salt/cloud/clouds/oneandone.py
- salt/grains/core.py
- salt/modules/napalm_ntp.py
- salt/modules/win_update.py
- salt/modules/win_wua.py
- salt/modules/zabbix.py
- salt/renderers/pass.py
- salt/states/vault.py
- tests/unit/states/test_win_update.py
|
2018-06-06 13:35:36 -04:00 |
|
rallytime
|
3273bbdab7
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/modules/all/index.rst
- doc/topics/grains/index.rst
- doc/topics/releases/2016.3.4.rst
- doc/topics/spm/spm_formula.rst
- doc/topics/tutorials/cron.rst
- doc/topics/tutorials/index.rst
- doc/topics/tutorials/stormpath.rst
- salt/engines/slack.py
- salt/log/handlers/fluent_mod.py
- salt/modules/cyg.py
- salt/modules/junos.py
- salt/modules/namecheap_dns.py
- salt/modules/namecheap_domains.py
- salt/modules/namecheap_ns.py
- salt/modules/namecheap_ssl.py
- salt/modules/namecheap_users.py
- salt/modules/reg.py
- salt/modules/tomcat.py
- salt/modules/vault.py
- salt/modules/win_file.py
- salt/modules/zpool.py
- salt/output/highstate.py
- salt/renderers/pass.py
- salt/runners/cache.py
- salt/states/boto_apigateway.py
- salt/states/boto_iam.py
- salt/states/boto_route53.py
- salt/states/msteams.py
- salt/states/reg.py
- salt/states/win_iis.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/states/test_user.py
- tests/support/helpers.py
- tests/unit/cloud/clouds/test_openstack.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_junos.py
- tests/unit/pillar/test_git.py
- tests/unit/states/test_win_path.py
- tests/unit/test_pillar.py
- tests/unit/utils/test_format_call.py
- tests/unit/utils/test_utils.py
- tests/unit/utils/test_warnings.py
|
2018-06-01 14:54:12 -04:00 |
|
Erik Johnson
|
93ee5ee2b0
|
Fix all Sphinx warnings
Well, all but one, which we expect to see
|
2018-05-31 15:28:25 -05:00 |
|
Gareth J. Greenaway
|
15ca7a21c2
|
Fixing merge conflict.
|
2018-03-02 14:20:32 -08:00 |
|
Gareth J. Greenaway
|
d37ac991a6
|
Fixing lint, unused imports
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
2559815eb5
|
Adding tests for after and until. Updating schedule unit tests. Adding skip_reason and friends for those two cases. Moving them to the end for evaluation.
|
2018-02-20 10:01:19 -08:00 |
|
Erik Johnson
|
54f9785e6c
|
[PY3] Add unicode_literals to salt.utils modules (R-S)
|
2018-01-13 21:14:09 -06:00 |
|
Denys Havrysh
|
d1f247e49e
|
Add basic unit tests for schedule util eval func
|
2017-11-30 12:43:52 +02:00 |
|
rallytime
|
62b31d7620
|
Pylint fixes
|
2017-03-23 10:00:20 -06:00 |
|
rallytime
|
235a768872
|
Merge branch '2016.11' into 'develop'
Conflicts:
- salt/returners/influxdb_return.py
- salt/states/dockerng.py
- salt/utils/schedule.py
- tests/unit/modules/test_docker.py
- tests/unit/states/dockerng_test.py
- tests/unit/utils/test_schedule.py
|
2017-03-22 17:44:08 -06:00 |
|
Pedro Algarvio
|
40a64191a1
|
Absolute imports and A LOT of code cleanup.
|
2017-03-01 01:33:07 +00:00 |
|
Pedro Algarvio
|
3beb3fb801
|
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
|
2017-02-28 22:52:49 +00:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|