1603 Commits

Author	SHA1	Message	Date
rallytime	d991430715	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-06-07 13:03:54 -04:00
Gareth J. Greenaway	f457f9cb84	Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name.	2018-06-06 21:23:28 -07: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
Daniel Wallace	e58f6bf4a4	use same python version in docker container	2018-06-05 10:57:09 -05:00
Daniel Wallace	f3cb8b73d7	fix tests	2018-06-04 14:01:33 -05:00
Daniel Wallace	b11920de68	add docker highstate test	2018-06-04 14:01:33 -05:00
rallytime	be8d34ec21	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-06-01 15:19:09 -04:00
rallytime	7e1d278d19	Update old utils paths to use new utils paths	2018-06-01 15:00:46 -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
Nicole Thomas	57d3fff54f	Merge branch 'develop' into move_to_utils_nacl	2018-05-31 15:16:10 -04:00
Nicole Thomas	8f78e3aef6	Merge pull request #47753 from Ch3LL/service_mac ... Add stderr launchctl helper class and fix service mac tests	2018-05-31 14:16:57 -04:00
Ch3LL	e15e674955	Add stderr launchctl helper class and fix service mac tests	2018-05-30 15:30:24 -04:00
Frode Gundersen	38d114a2d2	add whoami test	2018-05-29 21:51:02 +00:00
rallytime	d9096653f7	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/cloud/__init__.py - tests/integration/cloud/providers/test_ec2.py - tests/support/paths.py	2018-05-29 11:28:06 -04:00
rallytime	120ee16b70	Replace old utils paths with new utils paths	2018-05-29 11:19:34 -04:00
rallytime	dc32b67c03	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/win_snmp.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_pkg.py - tests/support/helpers.py - tests/support/runtests.py - tests/unit/fileserver/test_gitfs.py - tests/whitelist.txt	2018-05-29 11:14:39 -04:00
Nicole Thomas	0bf651b470	Merge pull request #47846 from Ch3LL/p_refresh_test ... Fix flaky refresh pillar integration test	2018-05-25 16:50:48 -04:00
Nicole Thomas	6f934c2259	Merge pull request #47823 from Ch3LL/win_dns_test ... Add win_dns module integration tests for windows	2018-05-25 16:34:02 -04:00
Ch3LL	019edad8e4	Fix flaky refresh pillar integration test	2018-05-25 15:13:56 -04:00
Ch3LL	7848114d6a	Add win_dns module integration tests for windows	2018-05-24 14:11:27 -04:00
Nicole Thomas	0ca5224cbf	Merge branch '2017.7' into winuser	2018-05-24 12:08:35 -04:00
Ch3LL	2509d36888	Add windows to service disable ERROR check in tests	2018-05-24 08:30:17 -04:00
Daniel A Wozniak	6a6ab69722	Get the current username on windows	2018-05-23 16:16:32 -07:00
Nicole Thomas	2cb6634c6b	Merge pull request #47773 from frogunder/45011 ... add win_servermanager.list_available test	2018-05-23 15:44:13 -04:00
rallytime	8d3c2be61c	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/modules/opkg.py - salt/modules/useradd.py - salt/output/table_out.py - salt/states/mysql_query.py - salt/states/user.py	2018-05-23 12:57:58 -04:00
rallytime	c328450be2	Update old utils paths to new paths	2018-05-23 12:35:47 -04: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
Frode Gundersen	7c9b0bda33	add win_servermanager.list_available test	2018-05-22 14:43:11 +00:00
Nicole Thomas	f45a96ba1d	Merge pull request #47668 from Ch3LL/win_pkg_test ... Add pkg.latest_version windows test	2018-05-21 16:26:44 -04:00
Nicole Thomas	b91c0f5647	Merge pull request #47680 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.1 to 2018.3	2018-05-17 17:30:27 -04:00
Gareth J. Greenaway	0fe32f4066	Updating integration/modules/test_archive to include filenames with unicode characters.	2018-05-17 09:20:38 -06:00
rallytime	6c06cb3ae3	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-16 12:46:26 -04:00
rallytime	9b1773a763	Merge branch '2018.3.1' into '2018.3' ... Conflicts: - tests/integration/states/test_pip_state.py	2018-05-16 12:43:41 -04:00
Ch3LL	a8981024de	Add pkg.latest_version windows test	2018-05-15 16:20:55 -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
Ch3LL	0a732d8e66	query the pip path for test test_issue_2087_missing_pip	2018-05-15 13:17:54 -04:00
rallytime	969296ecbe	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-05-15 12:38:01 -04:00
Ch3LL	6032a01f55	change disable check for upstart service on ubuntu14	2018-05-15 12:07:27 -04:00
Ch3LL	225d90ad4c	query the pip path for test test_issue_2087_missing_pip	2018-05-14 15:45:37 -04:00
Ch3LL	33b4cfbc5b	Change service assertion check for systemd platforms	2018-05-10 16:16:39 -04:00
Ch3LL	502c5bdff5	Ensure mac_service.disabled is correctly querying services	2018-05-09 17:12:50 -04:00
rallytime	cf58ae22bf	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/states/pip_state.py - tests/unit/utils/test_stringutils.py	2018-05-09 11:40:54 -04:00
rallytime	25f03ae425	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/modules/test_status.py - tests/integration/states/test_pip_state.py - tests/support/case.py - tests/whitelist.txt	2018-05-09 11:24:02 -04:00
rallytime	53d2851826	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py - salt/pillar/pillar_ldap.py - tests/integration/netapi/rest_tornado/test_app.py	2018-05-07 14:13:34 -04:00
rallytime	5565d5e9b1	Update old utils paths with new utils paths	2018-05-07 13:36:47 -04:00
rallytime	786076ac03	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/modules/get-settings.psm1 - salt/modules/cmdmod.py - salt/modules/pip.py - salt/modules/win_lgpo.py - salt/states/pip_state.py - tests/integration/states/test_pip.py - tests/support/helpers.py - tests/unit/modules/test_pip.py - tests/whitelist.txt	2018-05-07 13:17:01 -04:00
Mike Place	068da8ad7d	Merge branch '2017.7' into skip_diskusage	2018-05-07 09:20:38 -05:00
Nicole Thomas	da9871d36b	Merge pull request #47196 from twangboy/fix_47024 ... Fix issues with pip	2018-05-04 10:23:03 -04:00
Nicole Thomas	fa293f8fac	Merge pull request #47435 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-04 09:05:32 -04:00