98551 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	b94e0a01ac	Merge pull request #50055 from rallytime/bp-50024 ... Back-port #50024 to 2018.3	2018-10-16 11:14:06 +02:00
Mike Place	14f3fac0c4	Merge pull request #50056 from rallytime/bp-50029 ... Back-port #50029 to 2018.3	2018-10-16 11:12:58 +02:00
Mike Place	f3fe4b67f7	Merge pull request #50064 from rallytime/bp-50022 ... Back-port #50022 to 2018.3	2018-10-16 11:09:46 +02:00
Mike Place	c2a46ceda2	Merge pull request #50066 from garethgreenaway/49988_redact_passwords_in_source ... [2018.3] Redact any passwords from source paths	2018-10-16 11:08:24 +02:00
Mike Place	ab2cb51cbc	Merge pull request #50068 from garethgreenaway/1140_mac_system_tests_2018_3_failing ... [2018.3] Updating salt.utils.mac_utils	2018-10-16 11:07:09 +02:00
Mike Place	56577c17ba	Merge pull request #50069 from twangboy/fix_test_virt ... Fix `unit.modules.test_virt` for Windows	2018-10-16 11:06:11 +02:00
twangboy	cea321f9af	Fix unit.modules.test_virt for Windows ... Fix hard-coded unix-style paths	2018-10-15 17:16:57 -06:00
Gareth J. Greenaway	eedeacb65d	Updating another reference to salt.utils.mac_utils to use __utils__	2018-10-15 16:12:04 -07:00
Daniel Wallace	4c4bb5a489	Merge pull request #49987 from terminalmage/pillar_roots ... Make Pillar no longer munge file_roots	2018-10-15 16:58:08 -05:00
Nicole Thomas	1e377ace15	Merge pull request #50065 from rallytime/bp-50044 ... Back-port #50044 to 2018.3	2018-10-15 17:32:36 -04:00
Gareth J. Greenaway	27ef1e0ce0	Redact any passwords that are in http/https based source paths.	2018-10-15 14:03:43 -07:00
rallytime	1eaaab705f	Doc title formatting must match doc name length	2018-10-15 16:55:35 -04:00
Christian McHugh	6ac26b6c1e	add saltclass docs from release notes	2018-10-15 16:54:20 -04:00
Brian Saville	40da3ce2d0	Make test check_pillar more lenient	2018-10-15 16:50:57 -04:00
Nicole Thomas	8a6b4357f9	Merge pull request #50038 from s0undt3ch/2018.3 ... Don't squash the traceback	2018-10-15 16:36:55 -04:00
Nicole Thomas	dbfd7eed4d	Merge pull request #50054 from rallytime/bp-50004 ... Back-port #50004 to 2018.3	2018-10-15 16:36:02 -04:00
Nicole Thomas	a9e9974bd5	Merge pull request #50057 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-15 16:35:45 -04:00
Nicole Thomas	f1bcb1f275	Merge pull request #50060 from rallytime/fix-lint ... [2018.3] Fix some pylint issues that have popped up recently	2018-10-15 16:35:21 -04:00
Gareth J. Greenaway	a8f4f3927e	Merge branch '2018.3' into fix-lint	2018-10-15 13:33:33 -07:00
Nicole Thomas	b26b21c017	Merge pull request #50052 from rallytime/bp-49943 ... Back-port #49943 to 2018.3	2018-10-15 16:06:19 -04:00
Gareth J. Greenaway	931ec6154a	Fixing test_vault for python3.	2018-10-15 12:07:56 -07:00
Gareth J. Greenaway	90adb38b5d	Updating the integration.sdb.test_vault setup function to attempt to recreate the container if the login test fails.	2018-10-15 12:07:56 -07:00
rallytime	e73f13d766	[2018.3] Fix some pylint issues that have popped up recently	2018-10-15 13:29:54 -04:00
rallytime	1b5b018da2	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/minion.py - salt/states/lvm.py	2018-10-15 13:13:57 -04: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
Cody Crawford	2e46a783c5	Expose docs for Ansible modules	2018-10-15 13:01:22 -04:00
rwaweber	1ea72a00aa	docs: Correct spelling mistake and smooth out sentence	2018-10-15 12:58:28 -04:00
stanislaw_jakiel	88e32029ea	https://github.com/saltstack/salt/issues/49883 ... Using named argument in PublicIPAddress azure network_models API call	2018-10-15 12:47:48 -04:00
Gabriel	d336decde7	Handle non-ASCII chars during template data decode ... Change requested by terminalmage, line 255.	2018-10-15 11:54:24 -04:00
Gabriel	435afb76ad	Adjusted import to expose stringutils namespace	2018-10-15 11:54:18 -04:00
Gabriel	958c630e5c	Coerce string when calling compile_template_str ... Previously on python3 this would otherwise pass bytes (unhandled)	2018-10-15 11:54:14 -04:00
Erik Johnson	f59506d4cc	Update tests to reflect behavior changes	2018-10-15 10:16:44 -05:00
Neile Havens	7d6e628942	Merge branch '2018.3' into optimize-firewalld-state	2018-10-15 10:14:22 -05: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
Nicole Thomas	2d8210c136	Merge pull request #49991 from twangboy/fix_test_thin ... Fix `unit.utils.test_thin` for Windows	2018-10-15 09:55:32 -04:00
Nicole Thomas	23c7142bfd	Merge pull request #50037 from cbosdo/fluorine-backport ... Fluorine backport of virt module fixes	2018-10-15 09:31:30 -04:00
Pedro Algarvio	852257ab60	Don't squash the traceback	2018-10-15 11:17:29 +01:00
Cédric Bosdonnat	ce6faf6f03	Fix virt.init documentation ... Adjust virt.init documentation to match reality: disks use 'name' property, not 'disk_name'. (cherry picked from commit 8829d76bf4)	2018-10-15 08:59:19 +02:00
Cédric Bosdonnat	a6a68d66a4	Turn virt.pool_info name parameter optional ... If no name parameter is provided to virt.pool_info, return the infos for all storage pools. The result of the function has also been enhanced to return a dict mapping the name of the pool to its infos (cherry picked from commit 1e48abdfea)	2018-10-15 08:59:18 +02:00
Cédric Bosdonnat	1f903dd1e0	Turn virt.network_info name parameter optional ... If no name parameter is provided to virt.network_info, return the infos for all networks. The result of the function has also been enhanced to return a dict mapping the name of the network to its infos (cherry picked from commit 3e902384df)	2018-10-15 08:59:11 +02: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
Daniel Wozniak	fef7669a15	Merge pull request #49809 from Ch3LL/win_pkg_flaky ... Add additional asserts to help investigate test_win_pkg failure	2018-10-13 11:00:08 -07:00
twangboy	87563aef4e	Fix some lint	2018-10-12 17:25:03 -06: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
Megan Wilhite	f795b60537	Merge pull request #7 from dwoz/win_pkg_flaky ... Fix win_pkg test	2018-10-12 09:03:30 -04:00