87025 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	f28a4fa1a6	Merge pull request #50211 from channias/fix-spm-modules-install ... Fix broken install of additionnal modules in SPM packages	2018-10-24 15:41:22 -04:00
Nicole Thomas	6b4e07be03	Merge pull request #50212 from dwoz/test_no_fail ... Do not fail if process already ended	2018-10-24 15:22:46 -04:00
Daniel A. Wozniak	7f613ac020	Do not fail if process already ended ... We can expect the subprocess has already ended by the time we're checking for child processes. Handle this case gracefully so that tests do not fail with an exception.	2018-10-24 10:17:59 -07:00
Nicolas Chancereul	9b203d544d	Fix broken install of additionnal modules in SPM packages ... Fixes #44554	2018-10-24 18:44:46 +02:00
Nicole Thomas	85e22d2f25	Merge pull request #50207 from Ch3LL/2update_version_doc_2017.7 ... Update release versions for the 2017.7 branch	2018-10-24 11:51:12 -04:00
Nicole Thomas	d0356955e5	Merge pull request #50205 from Ch3LL/rn_2017.7.8 ... [2017.7.8] remove in progress and add security details	2018-10-24 11:49:51 -04:00
Ch3LL	198d25ca1d	Add 2017.7.8 previous release	2018-10-24 10:38:37 -04:00
Ch3LL	d4e26aceda	Update release versions for the 2017.7 branch	2018-10-24 10:34:24 -04:00
Ch3LL	71ee68b6f1	[2017.7.8] remove in progress and add security details	2018-10-24 10:27:39 -04:00
Mike Place	ce341f2424	Merge pull request #50180 from max-arnold/2017.7 ... Revert curly braces example for nested dictionaries	2018-10-23 12:00:56 -06:00
Max Arnold	881a521586	Revert curly braces example for nested dictionaries	2018-10-23 23:25:08 +07:00
Daniel Wallace	622bb51464	Merge pull request #50026 from damon-atkins/jenkins_pylint ... Jenkins CI Lint Improvements	2018-10-22 15:49:15 -05:00
Nicole Thomas	aa66d1b7ba	Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial ... [DOC] Fix JSON payload example in HTTP tutorial	2018-10-22 14:37:51 -04:00
Denys Havrysh	fe2d70d4a3	[DOC] Fix JSON payload example in HTTP tutorial	2018-10-22 18:57:04 +03:00
Damon Atkins	aebce88d82	Merge branch '2017.7' into jenkins_pylint	2018-10-23 00:35:54 +11:00
Damon Atkins	5f708fac39	use awk to create the other files, so git does not need to search again	2018-10-21 20:06:41 +11:00
Daniel Wallace	1a90c4fde2	Merge pull request #50144 from dwoz/winrm_fs_release ... Use newest winrm-fs release	2018-10-20 19:53:36 -05:00
Daniel A. Wozniak	0951d85433	Use newest winrm-fs release	2018-10-20 14:22:55 -07:00
Damon Atkins	6b96a24b97	Adjust jenkins linting process, only run stage if required, use git diff to find files, instead of find, report on status, changed and deleted files, lint only changed files.	2018-10-21 01:30:54 +11:00
Mike Place	e0965603bf	Merge pull request #50113 from rallytime/bp-49989 ... Back-port #49989 to 2017.7	2018-10-18 17:14:22 +02:00
William Giokas	27c7ac94b7	Increase centos7-py2 kitchen pr timeout to 8 hours ... The centos7-py2 tests have been consistently failing to finish before the timeout. I am increasing the timeout for these tests to 8 hours in order to see if we can finish a few of them. They should get much closer to finishing as the branch tests have been finishing at around the 6:30 or 7:00 mark sometimes.	2018-10-18 11:11:59 -04:00
Nicole Thomas	7ec3840d25	Merge pull request #49794 from twangboy/fix_groupadd_test ... Fix possible issue with test_groupadd	2018-10-17 10:20:33 -04:00
Mike Place	e562838f5f	Merge pull request #50028 from basseed/fix-windows-virtual-grain ... Fix #50015, Windows grain defaults to physical as unix grain	2018-10-16 11:29:40 +02:00
Nicole Thomas	9eb17ea21e	Merge pull request #50047 from rallytime/bp-49605 ... Back-port #49605 to 2017.7	2018-10-15 13:11:19 -04:00
Nicole Thomas	6cdd390379	Merge pull request #50017 from gtmanfred/iptables ... Use parse_known_args when checking iptables rules	2018-10-15 13:10:50 -04:00
rallytime	e3a0f7b6f2	Add gce fix to 2017.7.9 release notes	2018-10-15 11:03:06 -04:00
Joachim Gleissner	e6d86fca91	document GCE instance credentials configuration	2018-10-15 11:02:25 -04:00
Joachim Gleissner	c3a0d1b81a	allow empty service_account_private_key in GCE driver ... Passing an empty service_account_private_key to libcloud will enable authentication using instance credentials. Useful if you want to run salt-cloud on a GCE instance.	2018-10-15 11:02:13 -04:00
marcoc	8129ac6945	removed whitespaces	2018-10-14 21:58:46 +01:00
marcoc	82fa86617f	Fix #50015, Windows grain defaults to physical as unix grain	2018-10-13 23:34:30 +01:00
Nicole Thomas	a6a66b9b3f	Merge pull request #50012 from dwoz/norm_log ... Use normal log formatting and add jid	2018-10-12 14:40:18 -04:00
Daniel Wallace	e552e4f268	Use parse_known_args when checking iptables rules ... This will allow use of iptables custom extensions Fixes #50014	2018-10-12 09:53:26 -05:00
Daniel A. Wozniak	f96b29d1cc	Use normal log formatting and add jid	2018-10-11 23:39:56 -07:00
Nicole Thomas	15f86b2c69	Merge pull request #50001 from kyentei/doc-fix-gpg ... Fix gpg state Documentation	2018-10-11 09:16:36 -04:00
Nicole Thomas	7a235d7e95	Merge pull request #50000 from kyentei/doc-fix-lvm ... Fix LVM state documentation	2018-10-11 09:16:04 -04:00
Nicole Thomas	4edd094844	Merge pull request #49999 from kyentei/doc-fix-proxy ... Fix proxy documentation	2018-10-11 09:15:45 -04:00
Nicole Thomas	58d23025fb	Merge pull request #49998 from kyentei/doc-fix-process ... Fix documentation on process.py	2018-10-11 09:15:06 -04:00
Nicole Thomas	411635bc76	Merge pull request #49997 from kyentei/doc-fix-mysql ... Fix documentation for mysql processlist	2018-10-11 09:14:20 -04:00
Jeffrey Bouter	3d6ee3eeb6	Fix gpg state Documentation ... - gpg.absent doesn't add to user's keychain, but removes from - gpg.present user explanation fix	2018-10-11 14:09:45 +02:00
Jeffrey Bouter	c2f3d87740	Fix LVM state documentation ... - Capitalise the right words - Add clarification to lv_absent on vgname	2018-10-11 14:03:24 +02:00
Jeffrey Bouter	a180ed7032	Fix proxy documentation ... - Make user and password documentation identical	2018-10-11 13:53:31 +02:00
Jeffrey Bouter	edd4f40a6f	Fix documentation on process.py ... - Add clarification to the 'user' configuration	2018-10-11 13:47:52 +02:00
Jeffrey Bouter	01059cc857	Fix documentation for mysql processlist ... - Fix code block and indentation	2018-10-11 13:33:01 +02:00
Nicole Thomas	a8a3811b18	Merge pull request #49972 from rallytime/release-notes-2017.7.9 ... Add 2017.7.9 release notes file	2018-10-10 13:45:46 -04:00
Nicole Thomas	8de58d670b	Merge pull request #49974 from rallytime/bp-49940 ... Back-port #49940 to 2017.7	2018-10-10 13:41:33 -04:00
Nicole Thomas	d68e5d3d0b	Merge pull request #49978 from whytewolf/inotify_doc_change ... remove the incomplete exclude list.	2018-10-10 13:40:49 -04:00
Thomas "Whytewolf" Phipps	b4d9523a17	using an exclude list that does not list every operating system leaves open the possability that it would work on those not listed	2018-10-10 09:57:46 -07:00
Michael Lustfield	a70358a1cc	Update mod_watch() description for all states.	2018-10-10 10:20:03 -04:00
Michael Lustfield	bf3d0647fc	Another attempt to clean up service.mod_watch description.	2018-10-10 10:19:38 -04:00
Michael Lustfield	165b799abc	Clean up documentation/language in service state. (Fixes #40819)	2018-10-10 10:19:33 -04:00