95775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	aa48073896	Merge pull request #48420 from rares-pop/dev/iepopr/fix_log_warn ... Fix log.warn to log.warning	2018-07-05 11:45:53 -04:00
Nicole Thomas	9e2a75ff50	Merge pull request #47920 from AlexanderThaller/fix_freebsdkmod_remove ... Fixed remove and _remove_persistent_module which didnt understand the…	2018-07-05 10:37:24 -04:00
Rares POP	6fd736067d	Change few warning messages ... Signed-off-by: Rares POP <rares.pop@ni.com>	2018-07-04 11:39:28 +03:00
Nicole Thomas	a092b53154	Merge pull request #48397 from sjorge/smartosbeacons ... Beacons for imgadm and vmadm on SmartOS	2018-07-03 15:57:26 -04:00
Nicole Thomas	715becbb29	Merge pull request #48423 from rallytime/fix-versionadded ... Oxygen should be Fluorine in state.show_states addition	2018-07-03 15:50:12 -04:00
Nicole Thomas	41b7801921	Merge pull request #48425 from rallytime/codeowners-rfcs ... Add RCFS directory to team-core review list	2018-07-03 15:12:29 -04:00
Nicole Thomas	4f4d790832	Merge branch 'develop' into fix_freebsdkmod_remove	2018-07-03 15:07:54 -04:00
rallytime	9e42ea0683	Add RCFS directory to team-core review list ... Any additions/changes to the files in the `rfcs` directory should be reviewed by `@saltstack/team-core`.	2018-07-03 14:26:22 -04:00
Nicole Thomas	b8758e06ae	Merge pull request #48094 from spenceation/panos-proxy-http-patch ... - Adjusted PANOS proxy module to properly handle error HTTP codes.	2018-07-03 12:34:24 -04:00
Nicole Thomas	9096166bf2	Merge pull request #48419 from selfin/issue-48223-add-extra_index_url-support ... Fix #48223: broken pip extra-index-url param support at the pip_state	2018-07-03 12:14:50 -04:00
rallytime	090818bb9f	Oxygen should be Fluorine in state.show_states addition ... This feature was added in PR #44475, which is presently only in the `develop` branch. Therefore, the `versionadded` tag should be `Fluorine` instead of `Oxygen`.	2018-07-03 11:49:19 -04:00
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
Nicole Thomas	8b7bf937e2	Remove extra whitespace	2018-07-03 09:34:18 -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
Spencer Ervin	1346d6affe	Changed str to six.text_type.	2018-07-03 08:10:59 -04:00
Rares POP	569fe2a05a	Fix log.warn to log.warning ... log.warn got deprecated and this commit addresses the few places where was still in use Signed-off-by: Rares POP <rares.pop@ni.com>	2018-07-03 14:52:43 +03:00
Pablo Suárez Hernández	39e591bce5	Avoid double negative comparison	2018-07-03 12:49:19 +01:00
Aleksei Samoilik	07fd1cc883	Added extra-index-url pip option support to _check_if_installed at pip_state	2018-07-03 13:40:56 +03:00
Aleksei Samoilik	fc1e391b72	Added extra-index-url pip option support to list_all_versions function	2018-07-03 13:31:24 +03: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
Jorge Schrauwen	90ad6fd2e1	Add unit tests for vmadm beacon	2018-07-01 16:04:32 +02:00
Jorge Schrauwen	4892c0f9dc	Add unit tests for imgadm beacon	2018-07-01 15:56:54 +02:00
Jorge Schrauwen	f513b9d7ec	Add vmadm beacons for SmartOS	2018-07-01 15:56:54 +02:00
Jorge Schrauwen	0781d105e4	Add imgadm beacons for SmartOS	2018-07-01 15:33:27 +02: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