95330 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	0d4b799969	Upgrade requests to 2.20.1	2018-11-08 11:10:08 -07:00
Mike Place	d9179fb5b2	Merge pull request #50333 from garethgreenaway/50311_pkg_installed_fails_sources_hold ... [2018.3] Fix to pkg.installed for sources and hold: True	2018-11-08 11:02:32 -07:00
Mike Place	193c80a3a2	Merge pull request #50434 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-08 10:40:38 -07:00
Mike Place	73ce80f6e3	Merge pull request #50417 from meaksh/2018.3-fix-git_pillar-__env__-solving-for-merging ... Get the right target when using "__env__" on git ext_pillar to avoid merging problems	2018-11-08 10:07:02 -07:00
rallytime	83dfbb25bb	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-11-08 10:41:14 -05: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
Nicole Thomas	7bc9b3d94a	Merge branch '2018.3' into 50311_pkg_installed_fails_sources_hold	2018-11-07 15:49:56 -05:00
Wesley Whetstone	042445d8f9	fixing an issue on mac_system where the virtual function wouldnt load	2018-11-07 11:15:12 -08:00
Pablo Suárez Hernández	71af32d31a	Remove unicode references	2018-11-07 16:55:55 +00:00
Pablo Suárez Hernández	b7af5e52c5	Test git ext_pillar across multiple repos using __env__	2018-11-07 16:33:03 +00:00
Pablo Suárez Hernández	59894e2c83	Resolve target branch when using __env__	2018-11-07 16:33:00 +00: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
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
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	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
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
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	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
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
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
Daniel A. Wozniak	18b5d43d09	Increase cli batch test timeout for increased reliablity	2018-11-02 17:15:31 -07: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
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
Nicole Thomas	44f7af4897	Merge pull request #50350 from dubb-b/2017.7 ... Updating the AMI's and sizes for the test run.	2018-11-02 09:51:59 -04:00
lomeroe	dc58252e52	update to use a single line if statement when dealing with prepended ... text add comment on using +2	2018-11-02 08:03:43 -05:00
lomeroe	0e011ad805	add runTest method to class for PY2	2018-11-02 08:03:43 -05:00
lomeroe	377ec095ab	add a test for #47784	2018-11-02 08:03:43 -05:00
lomeroe	0a14505e21	change backslashes in comment string to fix lint error	2018-11-02 08:03:43 -05:00