101581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Akmod	65cb718533	Merge branch '2019.2.1' into aix_docs	2019-06-10 14:53:00 -06:00
Gareth J. Greenaway	781197113d	Merge branch '2019.2.1' into cp-52787	2019-06-10 12:45:06 -07:00
Daniel Wozniak	6b800a2b91	Merge pull request #53389 from bryceml/2019.2.1 ... only keep last 10 builds of every pr on jenkins to reduce disk usage	2019-06-10 10:18:46 -07:00
Bryce Larson	05368a124b	Merge branch '2019.2.1' into 2019.2.1	2019-06-10 11:13:28 -06:00
Akmod	32f4d7e3c7	Merge branch '2019.2.1' into aix_docs	2019-06-10 09:54:26 -06:00
Daniel Wozniak	fe18c40731	Merge pull request #53332 from s0undt3ch/hotfix/full-test-run-2019.2.1 ... Non optional full test runs for 2019.2.1	2019-06-10 08:51:40 -07:00
Gareth J. Greenaway	237273339f	Merge branch '2019.2.1' into hotfix/full-test-run-2019.2.1	2019-06-10 08:46:05 -07:00
Megan Wilhite	1d0b0a6ad3	Merge branch '2019.2.1' into ami_window_cloud	2019-06-10 10:55:54 -04:00
Bryce Larson	928b05f863	only fetch pr target branch instead of all branches to save time and disk space	2019-06-09 16:41:29 -06:00
Bryce Larson	ccc61060a0	only keep last 10 builds of every pr on jenkins to reduce disk usage	2019-06-08 11:27:01 -06:00
Gareth J. Greenaway	b970bde545	Merge branch '2019.2.1' into cp-52787	2019-06-07 09:29:26 -07:00
Gareth J. Greenaway	a59f45ebde	Merge branch '2019.2.1' into aix_docs	2019-06-07 09:11:27 -07:00
Shane Lee	d0810d78ad	Merge pull request #53287 from twangboy/fix_win_system ... Fix win system	2019-06-06 17:35:46 -06:00
Akmod	29f89a43b7	Merge branch '2019.2.1' into aix_docs	2019-06-06 17:16:26 -06:00
Akmod	477cd20cd4	Check dir_mode recursively in file.directory (#53385) ... * Created a test case * Fix states.file checking directory permissions recursively A change was introduced in 79f6b426ff (PR #50653) to check the file mode recursively. This change introduced a variable shadow that caused directory permission checking to fail. * Rename mode variable to dir_mode for clarity * Revert "Created a test case" This reverts commit 26fd01aa9382027415883e79c133b168a9a57cb3. * Re-added test case without irrelevant cosmetic code changes * Send string instead of integer - normalize values before comparison	2019-06-06 17:11:00 -06:00
Akmod	e74345cc03	Merge branch '2019.2.1' into aix_docs	2019-06-06 15:40:59 -06:00
Gareth J. Greenaway	cf98b83aad	Merge pull request #53386 from dwoz/missing_import ... Fix missing import	2019-06-06 13:45:58 -07:00
Akmod	28fbd11bbe	Merge branch '2019.2.1' into aix_docs	2019-06-06 12:21:41 -06:00
FireGrace	894f171430	change .next() to next() py2=>py3 leftover (#53240)	2019-06-06 12:04:29 -06:00
Megan Wilhite	18991f98eb	Merge pull request #53323 from dmurphy18/fix_53274 ... Fix for issue #53274, test on Amazon Linux 1	2019-06-06 13:31:17 -04:00
Tyler Johnson	60129f0061	Merge branch 'aix_docs' of github.com:Akm0d/salt into aix_docs	2019-06-05 16:56:51 -06:00
Tyler Johnson	fd197d3089	Merge branch '2019.2.1' of https://github.com/saltstack/salt into aix_docs	2019-06-05 16:56:16 -06:00
Akmod	a1c4abc1e1	Merge branch '2019.2.1' into aix_docs	2019-06-05 16:23:44 -06:00
Daniel A. Wozniak	a23d6d90ef	Fix missing import	2019-06-05 14:47:06 -07:00
Akmod	1c3667a3ac	Updated paramiko to version 2.2.3 for python3.7 support (#53356) ... * Updated paramiko to version 2.2.3 for python3.7 support * Handle nox running under Py2 and Py3 * Stop compiling static TCP requirements. * Fix Amazon 2018.03 in excludes * Compile requirements files	2019-06-05 12:07:28 -06:00
twangboy	0fc88fb437	Add TypeError	2019-06-05 10:39:25 -06:00
twangboy	5b4160d122	Try NumberOfEnabledCores ... Use a try/except block instead of comparing versions	2019-06-05 10:39:25 -06:00
twangboy	49cbfd4fe3	Add a note about skipping unavailable items	2019-06-05 10:39:25 -06:00
twangboy	044b56b7a6	Fix get_system_info for older versions of Windows ... Skip processor_cores_enabled as it's not available Get ChassisSKUNumber using the ComputerSystemProduct class	2019-06-05 10:39:24 -06:00
Akmod	e2c9fccc74	Merge branch '2019.2.1' into aix_docs	2019-06-05 10:24:39 -06:00
David Murphy	6814852d48	Merge branch '2019.2.1' into fix_53274	2019-06-05 09:31:12 -06:00
Pedro Algarvio	f8bd47b684	Merge branch '2019.2.1' into hotfix/full-test-run-2019.2.1	2019-06-05 11:35:09 +01:00
Pedro Algarvio	1cf57e9418	Merge pull request #53273 from s0undt3ch/hotfix/py3-nox-docs-2019.2.1 ... [2019.2.1] Switch docs building under Py3	2019-06-05 11:01:02 +01:00
Pedro Algarvio	dfd36a277f	Merge pull request #53361 from s0undt3ch/hotfix/fix-mp-logging-2019.2.1 ... [2019.2.1] Only make a new log record if it's a dictionary.	2019-06-05 10:56:14 +01:00
David Murphy	bb6c97a4f2	Merge branch '2019.2.1' into fix_53274	2019-06-04 15:15:58 -06:00
Tyler Johnson	6d42cf7419	Merge branch 'aix_docs' of github.com:Akm0d/salt into aix_docs	2019-06-04 14:10:58 -06:00
Tyler Johnson	97145b03ec	Merge branch '2019.2.1' of https://github.com/saltstack/salt into aix_docs	2019-06-04 14:10:37 -06:00
Tyler Johnson	6d163438b5	Updated 'used for' description of aixpkg	2019-06-04 14:09:38 -06:00
Akmod	fae6045c3e	Merge branch '2019.2.1' into aix_docs	2019-06-04 13:34:39 -06:00
Wayne Werner	5efb670404	Merge pull request #53351 from waynew/53171-fix-network-managed ... Add checks for Amazon Linux to ip module	2019-06-04 14:25:56 -05:00
Tyler Johnson	6092683774	Added aixpkg to index	2019-06-04 13:14:43 -06:00
Tyler Johnson	2867d07434	Added refs to AIX module documentation	2019-06-04 13:04:16 -06:00
Wayne Werner	e801afe3e5	Add checks for Amazon Linux to ip module ... Fixes #53171	2019-06-04 10:49:53 -05:00
Pedro Algarvio	d70d61fc8b	Fully revert 962b11687	2019-06-04 16:46:06 +01:00
Shane Lee	ce5d79adce	Merge pull request #53242 from s0undt3ch/hotfix/msgpack-ipc-2019.2.1 ... [2019.2.1] newer msgpack ipc fixes	2019-06-03 17:39:08 -06:00
Shane Lee	d27a524eb8	Merge branch '2019.2.1' into hotfix/msgpack-ipc-2019.2.1	2019-06-03 16:03:05 -06:00
David Murphy	b84833de45	Merge branch '2019.2.1' into fix_53274	2019-06-03 09:28:06 -06:00
Charles McMarrow	df448c20ed	Merge pull request #53289 from cmcmarrow/test_kubernetes_lint_failures_silenced ... stops pylint E1120 from showing No code was add it. Just fixing pylint warrnings	2019-06-01 04:57:26 +00:00
David Murphy	7085f36764	Fixed pylint issue on PR not showing when run pylint locally	2019-05-31 18:03:00 -06:00
David Murphy	1200031263	Updated to use package bash-doc if Amazon Linux 1 after review comments	2019-05-31 17:17:11 -06:00