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 |
|
rallytime
|
4abfd26e86
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- requirements/dev_python27.txt
- requirements/dev_python34.txt
- salt/fileclient.py
- salt/output/__init__.py
- salt/serializers/configparser.py
- salt/states/pkg.py
- salt/states/zpool.py
- salt/transport/tcp.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_mac_user.py
- tests/integration/modules/test_pip.py
- tests/integration/modules/test_pkg.py
- tests/integration/modules/test_service.py
- tests/integration/states/test_pip_state.py
- tests/integration/states/test_user.py
- tests/unit/modules/test_cmdmod.py
|
2018-05-23 12:33:00 -04:00 |
|
Ch3LL
|
ba40d3d1a1
|
Update test_mac_user_enable_auto_login to test both py2 and py3
|
2018-05-15 14:40:54 -04:00 |
|
Daniel Wallace
|
667b5b9f0c
|
fix unicode for mac autologin test
|
2018-02-23 17:00:56 -07:00 |
|
rallytime
|
0ad101d560
|
Merge branch '2017.7' into 'oxygen'
Conflicts:
- doc/man/salt.7
- salt/modules/git.py
- salt/modules/pacman.py
- salt/states/git.py
- tests/integration/modules/test_mac_user.py
- tests/support/parser/__init__.py
|
2018-01-26 17:27:03 -05:00 |
|
Gareth J. Greenaway
|
b3c1be27fb
|
Tier two unicode updates for modules, states and related tests.
|
2018-01-25 11:59:25 -08:00 |
|
Gareth J. Greenaway
|
f5f03e1e6c
|
Fixing integration.modules.test_mac_user.MacUserModuleTest.test_mac_user_disable_auto_login
|
2018-01-22 14:10:23 -08:00 |
|
rallytime
|
db5866d097
|
Update old utils paths to new utils paths
|
2017-12-11 18:43:33 -05:00 |
|
twangboy
|
068e463870
|
Fix lint, add integration tests
|
2017-12-04 13:29:37 -07:00 |
|
Pedro Algarvio
|
7b713d9256
|
Use the more portable helper skip_if_not_root.
|
2017-04-04 18:58:21 +01:00 |
|
Pedro Algarvio
|
2ee6d5d589
|
Import from the original modules not tests.integration
|
2017-04-04 18:58:19 +01:00 |
|
Pedro Algarvio
|
104f7a71f2
|
Why do need the system grains here?! This is an expensive call.
|
2017-04-01 14:22:55 +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 |
|