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
pengyao
b6d5eb500b
Security first
2018-05-22 14:13:20 +08:00
pengyao
21beeb249a
add priv_passwd property for Roster unittest
2018-05-22 14:00:15 +08:00
Ch3LL
1fd0295cca
Add stringutils.to_str in test_roster_config_validate test
2018-02-20 16:22:15 -05:00
Erik Johnson
7c9d95a725
[PY3] Add unicode_literals to config, executors
2018-01-07 14:48:45 -06:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly
...
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
2017-12-27 09:30:58 -06:00
Dmitry Kuzmenko
64954d8e40
Fixed pylint errors.
2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2b3276077c
Py3: Fixed schema serialization. Enabled tests back.
2017-06-01 16:49:49 +03:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version
2017-03-08 19:22:33 +00: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
Pedro Algarvio
04b4d0947e
Disable tests on Py3.
...
The order of attributes is sketchy under Py3 and this code will be
deprecated.
2017-02-17 20:48:55 +00:00
Erik Johnson
1b9217d636
Update jsonschema tests to reflect change in jsonschema 2.6.0 ( #39260 )
...
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
2017-02-08 16:51:56 -07:00
Pedro Algarvio
359348ba1c
Fix SSH Roster Schema unittests
2015-07-28 12:37:19 +01:00
Pedro Algarvio
034353040c
Make the tests discoverable
2015-07-28 12:23:18 +01:00
Pedro Algarvio
d649252878
Fix class reference
2015-07-28 10:33:08 +01:00
Pedro Algarvio
63cecaddf4
Implement the Roster config schema
2015-07-28 00:42:55 +01:00
Pedro Algarvio
eabc84d93c
Implemented RosterEntryConfig and added unit tests for it
2015-07-28 00:42:55 +01:00
