99102 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Mike Place	ef4509e779	Merge pull request #50370 from dwoz/pubd_msg_logs ... Log message flow to publish daemon	2018-11-05 12:32:01 -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
Daniel A. Wozniak	58ced12b57	log jid to payload size	2018-11-03 17:51:49 -07:00
Daniel A. Wozniak	3c537b5550	Log message flow to publish daemon	2018-11-03 17:43:00 -07: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
twangboy	c5a9af7fbe	Increase timeout	2018-11-02 18:21:35 -06:00
Daniel A. Wozniak	18b5d43d09	Increase cli batch test timeout for increased reliablity	2018-11-02 17:15:31 -07:00
twangboy	6948274c25	Add some timeouts	2018-11-02 17:11:50 -06:00
Jerzy Drozdz	a9b9fa2cce	Fixed pylint warnigs	2018-11-03 00:06:25 +01:00
twangboy	d968b7df0a	Adds timeouts to the manage.down runner ... Passes timeouts to the runner from the test	2018-11-02 16:17:36 -06:00
Jerzy Drozdz	342786bdc3	Issue #50254 fixed	2018-11-02 23:03:11 +01:00
Jerzy Drozdz	1ab59e7e48	Added integration tests	2018-11-02 23:02:04 +01:00
Jerzy Drozdz	110f74f3ba	Added unit tests reproducing issue	2018-11-02 23:01:43 +01:00
twangboy	b4b0a71a0f	Fix test_matcher on Windows ... Fixes a timeout issue in test_salt_documentation_arguments_not_assumed	2018-11-02 14:30:31 -06:00
Daniel Wozniak	99c8f356eb	Merge pull request #50345 from dwoz/pub_d_logging ... Configure logging for ZMQ PubServer daemon	2018-11-02 12:40:31 -07:00
Gareth J. Greenaway	b8ded8bf5f	Updating the swap function in the mount.swap function also check the device name when checking the fstab data. Updating tests to reflect new behavior.	2018-11-02 12:23:24 -07:00
Gareth J. Greenaway	8885d1ff3d	Merge branch '2018.3' into 41342_beacon_state_module_fixes	2018-11-02 12:08:19 -07:00
Antonio Jordan	f7041285d5	fixing type in load beacon module and adding option validators to config check function along with mock default values in test, fixes #48343	2018-11-02 18:52:12 +00:00
Antonio Jordan	4114a4f5d8	fixing type in load beacon module and adding option validators to config check function along with mock default values in test	2018-11-02 18:22:55 +00:00
Mark Gomersbach	a2838dbd05	Satisfy pylint checks	2018-11-02 17:52:21 +01:00
Shane Lee	3ffa3921b7	Merge pull request #50006 from lomeroe/issue48782_2018.3 ... Correct more issues in lgpo	2018-11-02 10:32:28 -06:00
rallytime	0621f7dd2e	Add a few more feature release codenames to the version_numbers doc	2018-11-02 12:15:53 -04:00