93824 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	fceb6d8d6f	Update old utils paths to use new paths	2018-08-08 13:35:30 -04:00
rallytime	3e6445a9d6	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/beacons/log.py - salt/client/ssh/__init__.py - salt/modules/cmdmod.py - salt/utils/win_functions.py - tests/integration/modules/test_cmdmod.py - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py	2018-08-08 13:31:57 -04:00
Nicole Thomas	b49eeca6e9	Merge pull request #49003 from rallytime/boto-test-2017.7 ... Back-port #48999 to 2017.7	2018-08-08 11:35:48 -04:00
Nicole Thomas	b87bf905c2	Merge pull request #49004 from rallytime/boto-test-2018.3 ... Port #48999 to 2018.3	2018-08-08 11:32:46 -04:00
rallytime	9f0b9a1073	Update expected return value in boto test ... The expected return from moto has changed from `-1` to `None` in the latest version of moto (1.3.4). This PR updates the test to be in line with the return from moto.	2018-08-08 10:44:38 -04:00
rallytime	1a23bb233f	Update expected return value in boto test ... The expected return from moto has changed from `-1` to `None` in the latest version of moto (1.3.4). This PR updates the test to be in line with the return from moto.	2018-08-08 10:42:57 -04:00
Nicole Thomas	630f61e625	Merge pull request #48987 from twangboy/fix_48786 ... Fix issue with win_iis.create_cert_binding	2018-08-08 09:29:05 -04:00
Nicole Thomas	51eed1fdfb	Merge pull request #48988 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.8 to 2017.7	2018-08-08 08:56:09 -04:00
rallytime	df8699e2e7	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-08-07 21:30:24 -04:00
twangboy	86d0836f90	Fix issue with iterating over None ... Sometimes DnsNamesList is None or not present. It was stacktracing while trying to iterate over it. Now it checks for non iterables.	2018-08-07 17:56:38 -06:00
Nicole Thomas	ab1a713bc3	Merge pull request #48934 from terminalmage/issue48777 ... Properly handle latin-1 encoding in file diffs	2018-08-07 17:02:23 -04:00
Daniel Wallace	10fd4661ff	Merge pull request #48978 from gtmanfred/2017.7 ... clean up gemfile	2018-08-07 14:03:58 -05:00
Nicole Thomas	a1e54634dc	Merge pull request #48976 from rallytime/tornado ... Skip unreliable tornado tests	2018-08-07 14:55:24 -04:00
Nicole Thomas	22713be9c1	Merge pull request #48979 from rallytime/bp-48959 ... Back-port #48959 to 2017.7.8	2018-08-07 14:11:52 -04:00
Nicole Thomas	bad995462c	Merge pull request #48956 from gtmanfred/openstack ... if booted from volume, use string from image	2018-08-07 12:39:44 -04:00
Nicole Thomas	5b2423e527	Merge pull request #48959 from rallytime/flaky-tests ... Mark some more tests as flaky	2018-08-07 12:33:15 -04:00
Daniel Wallace	6108363f82	clean up gemfile ... Remove opennebula, since we are using docker and ec2 Pin winrm to the package since our changes have been released by upstream	2018-08-07 11:01:07 -05:00
rallytime	0bd838ab6c	Skip unreliable tornado tests ... Marked as flaky originally, but they're still flaky with undetermined race-conditions. These are skipped in 2018.3 and forward, so let's skip them here as well.	2018-08-07 11:22:18 -04:00
Nicole Thomas	03aa0e49b0	Merge pull request #48970 from Ch3LL/back_48962 ... [2017.7.8] Backport #48962	2018-08-07 11:01:56 -04:00
Erik Johnson	52c64e4d51	Fix to_unicode test ... Since latin-1 is not being automatically decoded, we need to explicitly pass it on the test.	2018-08-07 09:57:21 -05:00
Nicole Thomas	e6cea5e3c7	Merge pull request #48968 from rallytime/man-pages ... Update man pages for 2017.7.8 release	2018-08-07 10:29:07 -04:00
Gareth J. Greenaway	3ce1b8a3c9	Update the elif block to only be true for versions below Debian 9.	2018-08-07 09:58:40 -04:00
rallytime	64fe3be41a	Update man pages for 2017.7.8 release	2018-08-07 09:35:01 -04:00
Nicole Thomas	79994ecab4	Merge pull request #48962 from garethgreenaway/1022_test_service_disable_debian_part_deux ... [2017.7] Fixing tests/integration/modules/test_service.py	2018-08-07 07:52:51 -04:00
Daniel Wozniak	1a1bda00cb	Merge pull request #48960 from dwoz/block_replace_tests ... Multiple block replace test fixes	2018-08-06 16:01:25 -07:00
Gareth J. Greenaway	9e71551b36	Update the elif block to only be true for versions below Debian 9.	2018-08-06 15:11:55 -07:00
Nicole Thomas	93b862f350	Merge pull request #48957 from whytewolf/beacons_log_doc_change ... Update salt.beacons.log to reflect that re module is used for matching.	2018-08-06 16:52:26 -04:00
Daniel A Wozniak	94ac2b4fc7	Multiple block replace test fixes	2018-08-06 13:35:21 -07:00
Erik Johnson	e2d19f40b6	Only try latin-1 from get_diff instead of by default	2018-08-06 15:31:21 -05:00
Erik Johnson	d39fa889f3	Add stringutils.get_diff to mocks	2018-08-06 15:27:13 -05:00
rallytime	aaf986d728	Mark one grains test as flaky & convert to pytest notation	2018-08-06 15:03:27 -04:00
Nicole Thomas	0245cffb07	Merge pull request #48955 from terminalmage/service-systemd ... Don't load service.py if minion is running a non-sysvinit init system	2018-08-06 15:01:08 -04:00
rallytime	e7e5abcf48	Mark 2 matcher tests as flaky	2018-08-06 14:47:44 -04:00
Thomas Phipps	a77fd16869	Update salt.beacons.log to reflect that re module is used for matching. ... As more non-python users are starting to use Salt, it would be useful to point out which regular expression engines are in use so that users can adapt accordingly.	2018-08-06 11:31:44 -07:00
Daniel Wallace	4cb1636c4b	if booted from volume, use string from image ... If cloud servers in openstack are booted with a volume as their root partition, they do not have an image assigned to them, so they won't have an image id. In these cases just pass the string from node.image to the image information about that machine. Fixes #47766	2018-08-06 12:06:10 -05:00
Erik Johnson	23f87bd536	Don't load service.py if minion is running a non-sysvinit init system ... This keeps service.py from overriding systemd.py, among others.	2018-08-06 10:10:32 -05:00
Nicole Thomas	848d583438	Merge pull request #48950 from KaiSforza/kitchenfix-2017.7 ... Added a quote to kitchen Jenkinsfiles	2018-08-06 10:29:07 -04:00
William Giokas	5242cb143a	Added a quote to kitchen Jenkinsfiles ... Kitchen wasn't running correctly	2018-08-06 08:25:25 -06:00
Nicole Thomas	71f587edd7	Merge pull request #48319 from gtmanfred/jid ... don't break older returners right now	2018-08-06 09:19:42 -04:00
Nicole Thomas	1623e53ef4	Merge pull request #48941 from rallytime/bp-48912 ... Back-port #48912 to 2018.3	2018-08-06 09:09:37 -04:00
Nicole Thomas	928d688d65	Merge pull request #48943 from rallytime/flaky-tests ... Mark some shell and runner integration tests as flaky	2018-08-06 09:08:13 -04:00
Erik Johnson	5b191c9120	Fix incorrect use of __salt__ when __utils__ is needed	2018-08-06 06:26:57 -05:00
Erik Johnson	53ba10ad5f	Skip pylint false-positives	2018-08-06 06:26:37 -05:00
Daniel Wallace	cd42510d3a	Merge pull request #48940 from rallytime/bp-48852 ... Back-port #48852 to 2017.7	2018-08-05 16:32:26 -05:00
rallytime	668da57ab9	Mark some shell and runner integration tests as flaky ... In addition to marking these tests as flaky, the commit also updates the affected tests to use pytest notation instead of unittest notation.	2018-08-05 16:19:29 -04:00
msermin	3f55b2f89e	make jboss7.py compatible with 2018.3.0 and later	2018-08-05 15:55:01 -04:00
William Giokas	fa4ef92e79	Record all the artifacts from the build	2018-08-05 15:53:18 -04:00
Nicole Thomas	43649a68be	Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_installed_held_centos ... [2017.7] Fix to test_pkg.test_pkg_015_installed_held	2018-08-05 15:47:38 -04:00
Nicole Thomas	084e7f0ef4	Merge branch '2018.3' into jid	2018-08-05 15:16:41 -04:00
Nicole Thomas	070af9d925	Merge pull request #48897 from rallytime/bp-48863 ... Back-port #48863 to 2018.3	2018-08-05 15:15:50 -04:00