98907 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	a921df0fb6	Merge pull request #50437 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-09 09:33:56 -05:00
Mike Place	675a35959a	Merge pull request #50405 from twangboy/fix_test_decorators ... Fix integration.modules.test_decorators for Windows	2018-11-08 10:23:42 -07:00
Mike Place	352afc90bc	Merge pull request #50432 from cbosdo/fluorine-backport ... Update create disk fix	2018-11-08 09:03:17 -07:00
rallytime	b86ad94fb1	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/master.py - salt/transport/tcp.py	2018-11-08 10:44:10 -05:00
Cédric Bosdonnat	e6f5b66077	virt: fix pylint 2.x errors	2018-11-08 15:44:48 +01:00
Cédric Bosdonnat	55823cb3a4	virt.update: create missing disk images ... When running virt.update to add new virtual disks, the disks are defined, but the actual image is not created. Use the same function than virt.init to implement this.	2018-11-08 15:44:48 +01:00
Cédric Bosdonnat	040bf4a39c	Fix virt.pool_info usage in virt.update ... pool_info was changed to return a dict of pool infos even for a single pool search. Adapt calls of it in the virt module.	2018-11-08 15:44:48 +01:00
Nicole Thomas	e9464c947e	Merge pull request #50423 from garethgreenaway/50292_no_error_log_test_true ... [2018.3] Fixes to sysctl modules and state	2018-11-08 09:12:59 -05:00
Gareth J. Greenaway	95a7f125a7	Adding file check and empty list return to freebsd_sysctl.py	2018-11-07 15:59:50 -08:00
Gareth J. Greenaway	469c090330	Adding a check to see if the config file exists, if not then return an empty list so we get the would be changes. Adding a test for this functionality.	2018-11-07 15:50:17 -08:00
Gareth J. Greenaway	fccf875077	Merge pull request #50421 from weswhet/fix-mac_system-loader ... fixing an issue on mac_system where the virtual function wouldnt load	2018-11-07 13:57:43 -08:00
Wesley Whetstone	042445d8f9	fixing an issue on mac_system where the virtual function wouldnt load	2018-11-07 11:15:12 -08:00
Nicole Thomas	d2fc910d59	Merge pull request #50409 from casselt/mount-device_name_regex-test-mode-fix ... Fix test mode for mount state if device_name_regex is used.	2018-11-07 11:04:44 -05:00
Torsten Casselt	56d5a32ca4	Fix test mode for mount state if device_name_regex is used. ... If mount.mounted is used for NFS or ceph-fuse, device_name_regex is often needed to avoid remounting every time. If run with test=True, Salt is always telling that it needs to remount while it is not remounting if run with test=False. This commit changes the order of checks to first check for a matching regex and then for the test mode and not the other way around.	2018-11-07 09:20:14 +01:00
twangboy	3e0803c588	Fix integration.modules.test_decorators for Windows ... Adds a exit_code.cmd file for Windows Uses `posix=True` for shlex_split on Windows	2018-11-06 16:17:39 -07:00
Mike Place	c2fda9dd9c	Merge pull request #50383 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-06 08:51:52 -07:00
Mike Place	46c7dc2d90	Merge pull request #50236 from rallytime/fix-cloud-vt ... Fix salt-cloud UnicodeEncodeError when writing to stdout	2018-11-05 15:04:17 -07:00
Mike Place	333a133f83	Merge pull request #50385 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-05 13:51:16 -07:00
Nicole Thomas	ed4fa8710b	Merge pull request #50382 from garethgreenaway/50062_max_event_size_does_not_always_trim_large_events ... [2018.3] Fix to utils/dicttrim.py to honor max_event_size with nested dictionaries	2018-11-05 15:04:05 -05:00
Nicole Thomas	493d6538bc	Merge pull request #50387 from rallytime/bp-50339 ... Back-port #50339 to 2018.3	2018-11-05 15:03:14 -05:00
Mike Place	cf14408a49	Merge pull request #50362 from twangboy/fix_test_matcher ... Fix test_matcher on Windows	2018-11-05 12:36:52 -07:00
Mike Place	369886aa28	Merge pull request #50365 from twangboy/fix_test_manage ... Fix `integration.runners.test_manage` on Windows	2018-11-05 12:35:55 -07:00
Gareth J. Greenaway	039f3d1622	Increase limit for trimming.	2018-11-05 11:22:20 -08:00
Nicole Thomas	a3f264d940	Lint: Add extra blank line	2018-11-05 14:22:01 -05:00
Bart Laarhoven	bd18412740	The driver requires dependency, not the other way around. ... Updated a very annoying (personal opinion) incorrect error message.	2018-11-05 14:21:52 -05:00
twangboy	b0341ea7dc	Remove flaky test	2018-11-05 12:15:06 -07:00
rallytime	a02564c7c0	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/utils/win_dacl.py	2018-11-05 14:06:42 -05:00
Nicole Thomas	f2d4b7b098	Merge pull request #50379 from cbosdo/fluorine-backport ... Virt disk fixes - Fluorine backport	2018-11-05 14:03:53 -05:00
Gareth J. Greenaway	7f77bfef99	Adding test for utils/dicttrim.py	2018-11-05 10:58:36 -08:00
rallytime	e993692d01	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/master.py - salt/transport/tcp.py - salt/transport/zeromq.py - tests/integration/cli/test_batch.py	2018-11-05 12:54:30 -05:00
Nicole Thomas	cd7c95f200	Merge pull request #50128 from mgomersbach/fix-py3-reload-compat ... Workaround for py2 builtin, =<3.3 imp and >=3.4 libimport quirks	2018-11-05 12:32:31 -05:00
Gareth J. Greenaway	9b55ac7230	Adding _trim_dict_in_dict to utils/dictrim.py to be called from trim_dict when data contains a nested dictionary. This will ensure that values will still be trimmed correctly.	2018-11-05 08:54:18 -08:00
Cédric Bosdonnat	f9b6171aed	virt: fix disk targets before diffing ... Ensure the disk target devices are unique within the disks in the new list before diffing them. Libvirt will reorder the disks based on their targets. If the users gives a disk order that is not consistent with the currently running VM, then it's his fault giving us wrong data.	2018-11-05 17:07:45 +01:00
Cédric Bosdonnat	d1ec0da2c0	virt: try hard not to break the disk order in update ... While updating a domain, we need to ensure the disks are in the order defined by the user.	2018-11-05 17:07:34 +01:00
Cédric Bosdonnat	99b453360f	virt: use a list of disks for the domain template ... Using a dict breaks the disk order which might be of importance to users. It only hides the disk name from the template rendering, but that one property wasn't used.	2018-11-05 17:07:19 +01:00
Cédric Bosdonnat	a75dcb3e9e	virt: introduce disk device type ... Disk devices can be of several types and we need to handle them in order to update existing VMms with floppy or cdrom devices. cdrom devices are particularly interesting since they can also have no source.	2018-11-05 17:05:55 +01:00
Cédric Bosdonnat	9099179b7a	Virt: VM disk source may not be specified ... Disks like cdroms have no source element. We need to handle iit in the disks comparison or we'll have exceptions when updating VMs that haven't been generated by salt virt module.	2018-11-05 17:04:48 +01:00
Nicole Thomas	aa6b149af7	Merge pull request #50354 from rallytime/version_num_docs ... Add a few more feature release codenames to the version_numbers doc	2018-11-05 10:46:45 -05:00
Nicole Thomas	c29f9d23a5	Merge pull request #50342 from Ch3LL/fix_unless_onlif_mac ... Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-05 09:22:21 -05:00
Nicole Thomas	426bb298e2	Merge pull request #50346 from rallytime/adjust-legacy-startup-deprectation ... Extend deprecation warning for enable_legacy_startup_events to Sodium	2018-11-05 09:20:31 -05:00
Nicole Thomas	3022b7db5b	Merge pull request #50347 from garethgreenaway/41342_beacon_state_module_fixes ... [2018.3] Fixes to beacon state module	2018-11-05 09:19:40 -05:00
Nicole Thomas	929525af1a	Merge pull request #50358 from garethgreenaway/41583_mount_swap_test_true_wrong_results ... [2018.3] fixes to function mount.swap in mount state	2018-11-05 09:16:49 -05:00
Nicole Thomas	6472100125	Merge pull request #50359 from dwoz/clitest ... Increase cli batch test timeout for increased reliablity	2018-11-05 09:15:02 -05:00
Nicole Thomas	f560570e84	Merge pull request #50368 from twangboy/fix_test_standard ... Fix `integration.client.test_standard` on Windows	2018-11-05 08:58:19 -05:00
Nicole Thomas	4120b9905a	Merge pull request #50369 from twangboy/fix_test_batch ... Fix `integration.cli.test_batch` for Window	2018-11-05 08:57:27 -05:00
twangboy	9858c4d792	Fix some lint	2018-11-03 10:53:49 -06:00
Mark Gomersbach	e453e82772	Satisfy pylint, use naming instead of W or E classification	2018-11-03 09:29:40 +01:00
Mark Gomersbach	d20581c962	Merge branch 'fix-py3-reload-compat' of github.com:mgomersbach/salt into fix-py3-reload-compat	2018-11-03 09:22:20 +01:00
Mark Gomersbach	5cd9741269	Satisfy pylint	2018-11-03 09:21:41 +01:00
Mark Gomersbach	48c6a4f6c0	Merge branch '2017.7' into fix-py3-reload-compat	2018-11-03 09:16:30 +01:00