95976 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	a1423c2a1f	add ansible playbook test	2018-07-12 11:29:36 -05:00
Daniel Wallace	a5677a5ed1	appease BOFH ... Also, handle @ for extra_vars	2018-07-12 11:29:18 -05:00
Daniel Wallace	9471666574	use itervalues	2018-07-12 11:29:17 -05:00
Daniel Wallace	ef436fe037	add ansible playbook runner to ansiblegate module	2018-07-12 11:29:17 -05:00
Daniel Wallace	6a2d2e6203	Merge pull request #48554 from gtmanfred/tox ... fix tox posargs and junits for pr tests.	2018-07-12 11:28:34 -05:00
William Giokas	8b665d845c	Set up junit in jenkins ... Moved the archive to the always statement. Doesn't change the junit stuff, but now we at least save the XML when we fail.	2018-07-12 11:27:41 -05:00
Daniel Wallace	5f8f256ded	add posargs to tox pylint	2018-07-12 11:26:50 -05:00
Nicole Thomas	27ada9a0de	Merge pull request #48531 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-12 09:58:13 -04:00
SaltStack Jenkins	69264f3332	Merge pull request #48446 from eugene-davis/influx-user-fixes ... Influx module user fixes	2018-07-12 08:17:22 -05:00
Mike Place	d4d6a786be	Merge pull request #48530 from SimonSapin/patch-1 ... Walkthrough: define the SLS accronym	2018-07-11 14:16:59 -06:00
rallytime	a04f8fc204	Update utils paths	2018-07-11 15:12:37 -04:00
Simon Sapin	c3bb0b9c14	Walkthrough: define the SLS accronym ... Some Googling suggests this is what it means.	2018-07-11 21:09:17 +02:00
rallytime	6f6c99b4ce	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/cron.py - salt/netapi/rest_tornado/saltnado.py	2018-07-11 15:06:35 -04:00
Daniel Wallace	ad4f7efafd	Merge pull request #48528 from gtmanfred/2018.3 ... add 2018.3 requirements for tox/pytest tests	2018-07-11 13:13:40 -05:00
Daniel Wallace	221559358a	add 2018.3 requirements for tox/pytest tests	2018-07-11 13:08:49 -05:00
Nicole Thomas	f8a2829d6b	Merge pull request #48244 from slivik/fix-apache_configfile-multiple-same-sections ... Fixed apache.configfile to work with multiple same sections.	2018-07-11 13:41:31 -04:00
Nicole Thomas	9017f5d7fb	Merge pull request #48523 from rrzaripov/fix-vagrant-cloud-doc ... Little fix in Vagrant cloud topic	2018-07-11 11:38:17 -04:00
Nicole Thomas	3858e301e3	Merge pull request #47970 from slivik/add_zabbix_admin_password_present ... Added new state zabbix_user.admin_password_present to change zabbix pass	2018-07-11 11:29:34 -04:00
Renat Zaripov	6b69f196f8	Little fix in Vagrant cloud topic	2018-07-11 18:10:41 +03:00
Nicole Thomas	70e5fcb8a5	Merge pull request #48508 from rallytime/fix-file-bug ... [2018.3] Fix 2 bugs found in the file.check_perms function	2018-07-11 11:03:31 -04:00
Nicole Thomas	5a0b274bf1	Merge pull request #48389 from garethgreenaway/48277_2018_3_file_roots_wrong ... [2018.3] reset file_roots for renderers after compile_pillar	2018-07-11 09:13:32 -04:00
slivik	171a92683e	one more again	2018-07-11 14:38:49 +02:00
slivik	f7daecd7b6	one more typo fixed	2018-07-11 14:29:51 +02:00
slivik	7ba69675ae	tests for modified function written	2018-07-11 14:20:47 +02:00
rallytime	0747eb5476	Move comment string join and test/changes check to bottom of file.check_perms ... In 2018.3, file attribute checks were added to file.check_perms and then the mode checks were moved down lower in the function. However, there is some logic to handle original comments where the list of comments is joined into a single string. There is also some logic to return `None` when changes are present. This logic is (correctly) at the bottom of the file.check_perms function in the 2017.7 branch. This commit moves that logic back down to the bottom of the file.check_perms function for the 2018.3 branch. We need this logic at the bottom of the function for the following reasons: 1. We must wait to detect if changes occur until the very end. If changes occur during the file attribute check, then the `None` return will not get set when it should be. 2. We cannot join the comment strings together until all of the potential comments have been added to the comment list. Otherwise the function will stacktrace because you cannot `append` to a unicode type.	2018-07-10 14:23:15 -04:00
rallytime	aefa1dbe21	Fix up bad merge - remove extra section of "mode" changes ... This came through in a merge-forward due to #48398 and #48399 Both PRs moved the "mode" section in file.check_perms down lower, but when the merge-forward went through, the section got added back again.	2018-07-10 13:53:34 -04:00
Eugene Davis	722e5a3d86	Update fluorine release notes with state module change	2018-07-10 17:48:45 +02:00
Eugene Davis	cb21a399ce	Merge branch 'develop' into influx-user-fixes	2018-07-10 17:08:26 +02:00
slivik	974a91a0e6	typos and formatting fixed	2018-07-10 16:22:52 +02:00
Nicole Thomas	f9fd1a889a	Merge pull request #48495 from garethgreenaway/48342_mysql_cache_unicode ... [2018.3] Fix to mysql cache module	2018-07-10 08:54:10 -04:00
Gareth J. Greenaway	0029f19033	Ensure the query_string is a bytestring, otherwise an attempt will be made to convert the msgpack data to unicode which will result in a UnicodeDecodeError error.	2018-07-09 17:45:23 -07:00
Nicole Thomas	e8fc110b52	Merge pull request #48488 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-09 14:40:17 -04:00
Nicole Thomas	fc3eeef6b3	Merge pull request #48487 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-09 14:37:59 -04:00
rallytime	cf83f3ffea	Update old utils paths to use new utils paths	2018-07-09 10:42:40 -04:00
rallytime	da646cb44f	Merge branch '2018.3' into 'develop' ... Conflicts: - doc/topics/event/events.rst - tests/integration/states/test_file.py - tests/unit/states/test_file.py	2018-07-09 10:40:23 -04:00
rallytime	54341d1a8d	Update old utils paths to use new utils paths	2018-07-09 10:34:38 -04:00
rallytime	68aabff0cf	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/req.txt - salt/netapi/rest_tornado/saltnado.py - salt/utils/versions.py - tests/integration/states/test_file.py	2018-07-09 10:27:58 -04:00
Nicole Thomas	51bc4d3002	Merge pull request #48477 from zachmoody/fix-netbox-login-required ... Fixes #48474 - Send Token in All Requests in NetBox Execution Module	2018-07-09 10:06:49 -04:00
Nicole Thomas	b8f2a86638	Merge pull request #48456 from cvedel/issue_48455 ... support RunOnce in the VMware salt-cloud driver	2018-07-09 09:42:24 -04:00
Nicole Thomas	4d4d2eacce	Merge pull request #48481 from terminalmage/slack-engine ... Improve the slack engine docs	2018-07-09 09:41:14 -04:00
Nicole Thomas	2f2a0ee320	Merge pull request #48421 from cbosdo/virt-running ... Virt states improvements	2018-07-09 09:33:49 -04:00
Nicole Thomas	6114a937c0	Merge pull request #48485 from cebe/patch-1 ... Make example Saltfile work by default	2018-07-09 09:28:47 -04:00
Carsten Brandt	6d9e83b8bd	Make example Saltfile work by default ... without Saltfile: ``` $ salt-ssh --saltfile=Saltfil '*' test.ping No permissions to access "/var/log/salt/ssh", are you running as the correct user? ``` Adding a log file to the example Saltfile makes everything work as expected.	2018-07-09 14:55:24 +02:00
Erik Johnson	56e8a1eb93	Improve the slack engine docs ... This explains the target/tgt_type options, adds some usage examples, and makes a few other documentation tweaks.	2018-07-07 21:41:01 -05:00
Erik Johnson	dde9c0640d	Add information on creating bot users	2018-07-07 11:28:25 -05:00
Erik Johnson	513c6af975	Fix inaccurate docs	2018-07-07 11:03:31 -05:00
Daniel Wallace	22cd4206c4	Merge pull request #48472 from gtmanfred/2017.7 ... use tox to run pylint	2018-07-06 21:46:46 -05:00
Mike Place	27ea8f35ea	Merge pull request #48476 from twangboy/fix_dependencies ... Fix dependencies	2018-07-06 17:43:25 -06:00
zmoody	0516d88cfd	Fixes #48474 - decouple token auth from private key in netbox execution module ... Decouples token and private_key_file config options. We'll send the token, if it's set, in all cases so that we can authenticate when LOGIN_REQUIRED is True.	2018-07-06 17:06:59 -05:00
twangboy	b0087d425c	Add license info	2018-07-06 15:55:14 -06:00