93705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	d39fa889f3	Add stringutils.get_diff to mocks	2018-08-06 15:27:13 -05:00
Erik Johnson	5b191c9120	Fix incorrect use of __salt__ when __utils__ is needed	2018-08-06 06:26:57 -05:00
Erik Johnson	53ba10ad5f	Skip pylint false-positives	2018-08-06 06:26:37 -05:00
Erik Johnson	f14f4dae22	Add unit test for latin-1 fallback, multi-encoding	2018-08-03 18:38:08 -05:00
Erik Johnson	906644a80f	PY3 scoping fix ... In PY3 the caught exceptions now drop out of scope when leaving the for loop.	2018-08-03 18:36:01 -05:00
Erik Johnson	726dd4331f	Add integration test for latin-1 file diffs	2018-08-03 17:30:17 -05:00
Erik Johnson	2dd1f31d23	Use BASE_FILES instead of redundant STATE_DIR	2018-08-03 16:46:01 -05:00
Erik Johnson	612ffb5fe8	Use new get_diff helper in file module	2018-08-03 16:39:53 -05:00
Erik Johnson	c632265802	Make to_unicode/to_str/to_bytes helpers attempt latin-1 ... Also allow for multiple encodings to be passed	2018-08-03 16:34:54 -05:00
Erik Johnson	2a0cb49b01	Add get_diff to salt.utils.stringutils	2018-08-03 15:56:58 -05:00
Daniel Wozniak	d4bb3a0963	Merge pull request #48871 from dwoz/test_cleanup ... Remove unicode key pairs from environ after test	2018-08-01 15:33:40 -07:00
Daniel A. Wozniak	f2e15e7f1d	Do not re-define tearDown	2018-08-01 15:11:29 -07:00
Daniel A. Wozniak	4f8a191a69	Remove unicode key pairs from environ after test	2018-08-01 14:28:57 -07:00
Nicole Thomas	bec79e83a3	Merge pull request #48843 from isbm/isbm-log-level-names-fix-2 ... Prevent u'something' to appear in help info.	2018-08-01 16:38:57 -04:00
Nicole Thomas	a8376b537a	Merge pull request #48855 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-01 13:44:58 -04:00
rallytime	44998c208e	Lint: Fix undefined logger variable	2018-08-01 10:05:14 -04:00
rallytime	92c9317a25	Update old utils paths to use new paths	2018-07-31 18:20:35 -04:00
rallytime	15bfba7143	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/slsutil.py - salt/modules/win_timezone.py - salt/states/pkg.py - tests/integration/states/test_pkg.py	2018-07-31 18:18:58 -04:00
Nicole Thomas	e23ba01cd2	Merge pull request #48830 from garethgreenaway/48659_file_grep_glob_fix ... [2018.3] Fixes to file.grep	2018-07-31 17:30:03 -04:00
Nicole Thomas	a63686180d	Merge branch '2018.3' into isbm-log-level-names-fix-2	2018-07-31 17:29:20 -04:00
Nicole Thomas	9fda70b3d0	Merge pull request #48814 from isbm/isbm-2018.3-smbios-bugfix ... dmidecode race conditions check	2018-07-31 16:48:28 -04:00
Nicole Thomas	3d16a63ff2	Merge pull request #48804 from Ch3LL/mac_brew ... Use brew path from which cmd in mac_brew module	2018-07-31 16:24:32 -04:00
Nicole Thomas	950c1014aa	Merge pull request #48836 from dwoz/unicode_names_py2 ... Fix unicode directory listing on py2	2018-07-31 16:22:52 -04:00
Nicole Thomas	05f2d65de3	Merge pull request #48853 from rallytime/bp-48850 ... Back-port #48850 to 2017.7	2018-07-31 16:21:48 -04:00
Nicole Thomas	8a1285239a	Merge pull request #48426 from garethgreenaway/46689_fixing_pkg_held_when_package_is_installed ... [2017.7] fixes to states/pkg.py	2018-07-31 16:18:04 -04:00
rallytime	3c33ee554a	Skip tests in integration.shell.test_master ... Related to https://github.com/saltstack/salt-jenkins/issues/378 This is likely causing all of the flakiness we're seeing on test runs when the master stops responding. These tests should be in their own, isolated run, rather than with the rest of the test suite.	2018-07-31 15:22:34 -04:00
Nicole Thomas	c8e69431ff	Merge pull request #47734 from OrlandoArcapix/Issue47689-pip-state-performance ... #47689 improve run-speed of pip package state	2018-07-31 15:15:34 -04:00
Nicole Thomas	baf8c5784a	Merge pull request #48847 from terminalmage/issue48695 ... Update file.blockreplace docs to reflect changed functionality	2018-07-31 14:11:29 -04:00
Nicole Thomas	644a1f4ff8	Merge pull request #48587 from twangboy/fix_lgpo ... Fix lgpo issue on Py3	2018-07-31 14:05:57 -04:00
Erik Johnson	e2bdf7fb92	Update file.blockreplace docs to reflect changed functionality ... See https://github.com/saltstack/salt/issues/48695#issuecomment-407414810	2018-07-31 12:50:28 -05:00
Nicole Thomas	83a5b3cc47	Merge pull request #48844 from AVeenstra/fix-python3-incompatibility ... Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.	2018-07-31 13:20:26 -04:00
Nicole Thomas	2bacc23481	Merge pull request #48796 from Ch3LL/remove_su ... Remove fake su used in integration tests	2018-07-31 13:08:53 -04:00
Gareth J. Greenaway	9b0f5dd212	Fixing identation, removing some unnecessary conditionals.	2018-07-31 09:46:06 -07:00
Gareth J. Greenaway	727964ab55	One last cleanup.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	11cb86e6eb	General cleanup in pkg state, reducing duplicate code. Fixing the requires_salt_modules decorator, sys.doc was returning too much information for the event to handle. This change specifically calls sys.doc with the module name.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	16fb6ae635	Make sure pkg.hold and pkg.unhold are available before running the test.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	998651102d	Fixing a situation when a package is already installed via salt or manually and a state attempts to set that package to be held. Previously the holding/unholding logic was only being run against packages that were being installed. This change moves the holding logic outside and runs it against all desired packages. Adding a new test to test holding logic.	2018-07-31 09:46:05 -07:00
Gareth J. Greenaway	0791b0a03c	FileGrepTestCase tests back to 2018.3	2018-07-31 09:33:58 -07:00
Gareth J. Greenaway	2e01c55e7e	Fixing a bug that prevents specifying wildcards for filenames.	2018-07-31 09:33:58 -07:00
Nicole Thomas	e818c752b3	Merge branch '2018.3' into mac_brew	2018-07-31 12:28:36 -04:00
Nicole Thomas	5f1141dc05	Merge branch '2018.3' into isbm-2018.3-smbios-bugfix	2018-07-31 12:28:01 -04:00
Daniel A. Wozniak	47e158b9f0	Optomize if statement	2018-07-31 09:26:13 -07:00
Nicole Thomas	00d06bda76	Merge pull request #48689 from linoplt/fix_38310_pygit2_checkout_ext_pillar_remote_using_tag ... Fix ext_pillar remote checkout using tag (pygit2)	2018-07-31 12:15:58 -04:00
Nicole Thomas	136ff6735a	Merge pull request #48662 from slaws/fix-retention-schedule-48637 ... Excluding relative dirs in state.file.retention_schedule	2018-07-31 12:15:08 -04:00
Nicole Thomas	5e14e36195	Merge pull request #48838 from sizgiyaev/fix-vault-policy-state ... Fixed: added additional return code 200 for succeeded vault api request	2018-07-31 12:14:21 -04:00
Nicole Thomas	1fc04f281b	Merge pull request #48840 from gtmanfred/docs ... fix links in pkg doc.	2018-07-31 12:13:00 -04:00
AVeenstra	f238779a62	Merge branch '2017.7' into fix-python3-incompatibility	2018-07-31 16:42:36 +02:00
Bo Maryniuk	783c96ac72	Prevent u'something' to appear in help info.	2018-07-31 16:20:59 +02:00
Daniel Wallace	8d2d268c4a	fix links in pkg doc. ... Closes #48818	2018-07-31 09:14:59 -05:00
Nicole Thomas	662bd1f780	Merge branch '2017.7' into Issue47689-pip-state-performance	2018-07-31 10:04:28 -04:00