95750 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	6ffc50e705	Merge pull request #48294 from meaksh/develop-zypper-multiversion-fixes ... Handle packages with multiple versions properly with zypper	2018-07-03 11:08:07 -04:00
Megan Wilhite	00952689de	Merge pull request #48403 from Ch3LL/rm_inprog_develop ... [develop] Remove In Progress Warning on 2017.7.7	2018-07-03 09:30:22 -04:00
Pablo Suárez Hernández	39e591bce5	Avoid double negative comparison	2018-07-03 12:49:19 +01:00
Ch3LL	0cfd233c0e	[develop] Remove In Progress Warning on 2017.7.7	2018-07-02 10:23:42 -04:00
Nicole Thomas	df5ef3e2b1	Merge pull request #48392 from garethgreenaway/1019_test_local_batch_failure ... [develop] Additional AUTH_INTERNAL_KEYWORDS	2018-07-02 09:09:04 -04:00
Mike Place	c61a58cb1e	Merge pull request #48359 from aneisch/patch-1 ... Update digitalocean.py	2018-06-30 22:21:57 -06:00
Mike Place	86793be76d	Merge pull request #48376 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-06-30 22:20:18 -06:00
Mike Place	74497da15c	Merge pull request #48387 from Ch3LL/1update_version_doc_develop ... Update release versions for the develop branch	2018-06-30 22:18:10 -06:00
Mike Place	4f7acaa496	Merge pull request #48395 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-06-30 22:12:36 -06:00
Gareth J. Greenaway	545d2acbb4	removing unused skipif	2018-06-30 16:39:41 -07:00
Gareth J. Greenaway	6a8d6979b4	Missing comma.	2018-06-30 14:40:46 -07:00
Gareth J. Greenaway	452d9d9bf7	fixing merge conflict.	2018-06-30 14:40:39 -07:00
rallytime	bf6c788350	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/client/ssh/__init__.py - salt/utils/thin.py	2018-06-30 09:48:06 -04:00
Nicole Thomas	9b364e25cf	Merge pull request #47147 from eliasp/2018.3-issue-45939-shadow-hash-salt ... states.user.present: Make usage of `hash_password` idempotent	2018-06-30 09:29:27 -04:00
Nicole Thomas	1472efbad0	Whitespace fix for lint	2018-06-30 09:22:57 -04:00
Nicole Thomas	ea90ff7b62	Merge pull request #48378 from cro/nxos-prompt-fix ... Cisco nxos proxy prompt fix	2018-06-30 09:18:10 -04:00
Nicole Thomas	d3cf9ccea3	Merge pull request #48340 from steveno/add_more_cron_tests ... Add more tests to cron.	2018-06-30 09:10:49 -04:00
Nicole Thomas	fdd1f24567	Merge pull request #48309 from terminalmage/fix-yaml-hacks ... Drop support for Python 2 unicode string literals in YAML renderer	2018-06-30 09:07:55 -04:00
Nicole Thomas	84786a0a6e	Merge pull request #48391 from sjorge/48374 ... Fix dependancy for esky build on SmartOS	2018-06-30 09:05:39 -04:00
Nicole Thomas	fbbafc8de4	Merge pull request #48300 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-06-30 08:58:27 -04:00
Nicole Thomas	89857ea8b9	Merge pull request #48297 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-06-30 08:57:34 -04:00
Jorge Schrauwen	0d31b1388b	Fix dependancy for esky build on SmartOS	2018-06-30 01:11:23 +02:00
Ch3LL	6956e4e8ae	Update release versions for the develop branch	2018-06-29 16:41:40 -04:00
C. R. Oldham	8c1c273f13	Make docstring raw	2018-06-29 14:20:59 -06:00
Nicole Thomas	712c7d943b	Merge pull request #47780 from moench-tegeder/postgres_options ... External WAL directory and datapage checksums for PostgreSQL	2018-06-29 15:36:54 -04:00
rallytime	9174ccb4a8	Skip some multiline nodegroup matcher tests ... These will need to be fixed and address in Fluorine	2018-06-29 15:04:13 -04:00
Erik Johnson	5303b1629c	The Jinja "sort" filter is useless	2018-06-29 13:49:24 -05:00
rallytime	c0b76d009d	Make sure salt.utils.args is imported for NETAPI	2018-06-29 14:47:03 -04:00
rallytime	a50dc60a1f	Skip new batch test in Fluorine until it can be investigated better	2018-06-29 14:46:50 -04:00
Daniel Wallace	304d5898b5	Merge pull request #48379 from KaiSforza/jenkins-clean-workspace ... Clean up the workspaces at the end for every job	2018-06-29 13:38:11 -05:00
rallytime	9498618418	Use saltenv opts instead of environment	2018-06-29 14:15:21 -04:00
William Giokas	a086e2525a	Clean up the workspaces at the end for every job	2018-06-29 12:07:08 -06:00
rallytime	172e4bda22	Reduce the number of days an issue is stale by 10	2018-06-29 11:01:19 -04:00
C. R. Oldham	842dc351e7	Fix mixing of regex and regexp.	2018-06-29 08:51:23 -06:00
Daniel Wallace	7d41e035f5	Merge pull request #48368 from asenci/fix_48367 ... Fix issue #48367 using the same approach as PR #46776	2018-06-29 08:41:23 -05:00
Andre Sencioles	c0a10ec63b	Fix issue #48367 using the same approach as PR #46776	2018-06-29 15:40:24 +12:00
C. R. Oldham	286875f5c1	Add a 'prompt_regexp' config variable that allows more customized response ... to potential prompts from the nxos cli.	2018-06-28 15:20:21 -06:00
Daniel Wallace	1bccb7a316	Merge pull request #48365 from dubb-b/develop ... Changing debug to info for logging	2018-06-28 15:50:12 -05:00
Brett Benassi	54660e8e40	Changing debug to info for logging	2018-06-28 14:48:27 -06:00
Daniel Wallace	c5746deb5f	Merge pull request #48364 from dubb-b/2018.3 ... Changing debug to info for logging	2018-06-28 15:48:23 -05:00
Brett Benassi	d8260b6628	Changing debug to info for logging	2018-06-28 14:46:31 -06:00
Nicole Thomas	0202493b60	Merge pull request #48354 from rallytime/merge-2018.3.2-to-2018.3 ... [2018.3] Merge forward from 2018.3.2 to 2018.3	2018-06-28 16:26:30 -04:00
rallytime	cc94c685c4	Update file unit tests to handle "writelines" change ... Since file.line is now using "writelines()" instead of "write()", we need to handle the unittests accordingly.	2018-06-28 15:41:43 -04:00
Steven Oliver	7e9235a7dd	Use range from six library	2018-06-28 14:35:45 -04:00
Nicole Thomas	bd5da83246	Merge pull request #48222 from Martin819/develop ... Fix GlusterFS module for version 4.0 and above	2018-06-28 14:21:55 -04:00
Andrew	8de470e57a	Update digitalocean.py ... Add option to install agent for metrics, advanced graphs and monitoring	2018-06-28 12:14:01 -05:00
rallytime	e51a8ee00c	Update file.line to use writelines instead of joining	2018-06-28 12:46:29 -04:00
rallytime	c49546f9e8	Add 'name' as the passed in filepath for test_line_insert_ensure_before_first_line test ... With 'foo', the test fails with an unknown file KeyError - we need to use the "name" variable instead. Fixes the test_line_insert_ensure_before_first_line test.	2018-06-28 12:07:38 -04:00
Martin Polreich	a447012f99	Merge branch 'develop' into develop	2018-06-28 17:19:04 +02:00
rallytime	fface7cc74	Merge branch '2018.3.2' into '2018.3' ... Conflicts: - tests/integration/runners/test_state.py	2018-06-28 10:05:18 -04:00