93867 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	b24c96a292	Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig ... Handle ifconfig output differently for NetBSD >= 8.0	2018-08-09 16:07:43 -04:00
Nicole Thomas	7d6b9ed0a5	Merge pull request #48803 from dmurphy18/aix_filesystems ... Support for execution modules and states mount on AIX	2018-08-09 13:51:54 -04:00
Nicole Thomas	2a38905a8a	Merge pull request #48929 from terminalmage/issue48496 ... 2 salt-key fixes	2018-08-09 13:50:06 -04:00
Nicole Thomas	bb9d23bfa1	Merge pull request #49022 from dwoz/47481_docs ... Document time format idiosyncrasies	2018-08-09 13:47:11 -04:00
Nicole Thomas	9b6a9ff4f1	Merge pull request #48932 from twangboy/fix_win_repo ... Fix pkg.install when pkg already installed	2018-08-09 13:45:50 -04:00
Nicole Thomas	d7b7a92ef6	Merge pull request #49011 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-09 13:34:17 -04:00
Nicole Thomas	3325b7d4c0	Merge pull request #48985 from garethgreenaway/48123_file_directory_recurse_fails_broken_symlink ... [2018.3] Fix to salt/modules/file.py	2018-08-09 11:03:08 -04:00
rallytime	02670969d0	Apply fix to ssh init file that was there before merge	2018-08-09 09:53:09 -04:00
rallytime	7e1f7915e4	Revert "Allow for not being prompted to supply a password to deploy keys to a minion with salt-ssh" ... This reverts commit a131c9beeb.	2018-08-09 09:50:52 -04:00
rallytime	00416d54d1	Revert "add key-deploy test" ... This reverts commit 5b443af7ae.	2018-08-09 09:50:40 -04:00
Travis Paul	d59b6d8269	Add unit test for NetBSD 8 ifconfig changes ... lint changes in salt/utils/network.py	2018-08-09 21:26:08 +08:00
Nicole Thomas	d353c02a8c	Merge pull request #49019 from garethgreenaway/47695_fixing_scheduler_bug_when_enabled_is_present ... [2018.3] Fix to scheduler when global enabled key is present	2018-08-09 09:06:25 -04:00
Nicole Thomas	a56bc7ffb9	Merge pull request #49023 from The-Loeki/patch-1 ... Salt SSH appends IdentityFile=agent-forwarding	2018-08-09 08:55:58 -04:00
Ronald van Zantvoort	8b53571c70	Salt SSH appends IdentityFile=agent-forwarding ... When you set `ssh_priv: agent-forwarding` in master.conf (or, untested, `priv: agent-forwarding` in roster), SSH agent authentication is supposed to be used. However, Salt SSH launches with `ssh -o IdentityFile=agent-forwarding`. This file/dir can't be found (doh) and the connection fails.	2018-08-08 23:49:22 +02:00
Daniel A. Wozniak	313a3d93d6	Document time format idiosyncrasies	2018-08-08 14:45:40 -07:00
Gareth J. Greenaway	aff1b8f6d4	Lint.	2018-08-08 14:33:25 -07:00
Nicole Thomas	4590494b50	Merge pull request #48981 from Ch3LL/mac_runas_quote ... Add warning to mac runas docs about escaping characters	2018-08-08 15:43:42 -04:00
Gareth J. Greenaway	8935c08141	Fixing a bug that occurs if the "enabled" key is present in the scheduler items dictionary. Adding a test to ensure scheduler runs as expected when that key is present.	2018-08-08 11:44:13 -07:00
David Murphy	92818f816b	Fixes for testing	2018-08-08 12:15:59 -06:00
David Murphy	77dd7a1743	Adjust unit tests	2018-08-08 12:15:59 -06:00
David Murphy	eaed033cde	Updated for review comments and adjusted locking when writing files	2018-08-08 12:15:59 -06:00
David Murphy	5bf9e6085b	Update due to review comments	2018-08-08 12:15:59 -06:00
David Murphy	9fb5641dc7	Mount unit tests for modules and states for AIX	2018-08-08 12:15:59 -06:00
David Murphy	b28f427432	Save off work after laptop issue	2018-08-08 12:15:59 -06:00
David Murphy	e5c2741fe7	module and states mount support for AIX	2018-08-08 12:15:59 -06:00
David Murphy	b701e16ad0	Further updates to support for mount on AIX	2018-08-08 12:15:59 -06:00
David Murphy	210076276f	Initial support for handling /etc/filesystems on AIX	2018-08-08 12:15:59 -06:00
twangboy	075ea29d29	remove .lower(), fix debug messages	2018-08-08 12:10:40 -06:00
rallytime	c26fa0d6c4	Mark orchestration test as expensive	2018-08-08 13:38:09 -04:00
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	10c4eca206	Merge branch '2018.3' into 48123_file_directory_recurse_fails_broken_symlink	2018-08-08 09:37:20 -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
Travis Paul	80f8a667d1	Handle ifconfig output differently for NetBSD >= 8.0 ... The netmask is now returned as part of the IP address in the ifconfig output. fixes #48856	2018-08-08 13:33:13 +08: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
Gareth J. Greenaway	a404cc030f	Fixing the issue when using the file.directory state with recurse if the directory contains a broken symbolic link. This fix adds an additional conditional, is_link, before running lsattr since lsattr does not work on symlinks and causes issues when that symlink is broken.	2018-08-07 15:46:24 -07: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
twangboy	d7c2f476ac	Remove current: version for latest as well	2018-08-07 14:06:14 -06:00
Ch3LL	8269b55b84	remove unnecessary spaces in cmdmod.py docs	2018-08-07 15:54:44 -04:00
Ch3LL	757daf7d7e	add runas macosx warning in 2018.3.3 release notes	2018-08-07 15:49:26 -04:00
Ch3LL	4e9e985b14	Add warning to mac runas docs about escaping characters	2018-08-07 15:24:14 -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
twangboy	522ac26459	Fix typo in code comment	2018-08-07 12:51:00 -06:00