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 |
|
Daniel Wallace
|
5316e4bd90
|
allow excluding multiple directories in rsync
|
2018-04-10 10:30:54 -05:00 |
|
Erik Johnson
|
06ec8db7e2
|
[PY3] Add unicode_literals to more high-priority states/modules
|
2018-01-22 08:26:28 -06:00 |
|
rallytime
|
ecb1e3cf82
|
Fix a couple of PY3 test failures in the rsync module
Fixes:
- unit.modules.test_rsync.RsyncTestCase.test_rsync
- unit.modules.test_rsync.RsyncTestCase.test_version
|
2017-12-15 14:32:32 -05:00 |
|
Pedro Algarvio
|
d397763553
|
Adjust to the new LoaderModuleMockMixin usage
|
2017-03-28 19:03:59 +01:00 |
|
Pedro Algarvio
|
5c13f7b2bb
|
Proper mocking.
|
2017-03-28 19:02:50 +01:00 |
|
Pedro Algarvio
|
9b1e55aa85
|
Import the full module namespace to avoid import shadowing.
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
|
2017-03-28 19:02:47 +01: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 |
|