95916 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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
Daniel Wozniak	491b5b077c	Merge pull request #48348 from dwoz/test_git ... Fix multiple git module tests	2018-07-06 13:35:57 -07:00
Daniel Wozniak	5ca5e060b3	Merge branch '2018.3' into test_git	2018-07-06 12:11:53 -07:00
Nicole Thomas	3f1f77ebd6	Merge pull request #48464 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-07-06 14:05:22 -04:00
Nicole Thomas	dd6a6a97c5	Merge pull request #48454 from terminalmage/issue48107 ... Improve error message when ext_pillar is incorrectly formatted	2018-07-06 14:03:43 -04:00
Nicole Thomas	a9dc758e73	Merge pull request #48398 from garethgreenaway/48336_ensure_chmodd_setuid_with_chown ... [2018.3] fixes to module/file.py	2018-07-06 14:02:42 -04:00
Nicole Thomas	c0d4279313	Merge pull request #48450 from isbm/isbm-saltssh-empty-passphrase ... Do not call VT terminal if no command or an empty password passed.	2018-07-06 10:35:44 -04:00
rallytime	0a814271dd	Reduce the number of days an issue is stale by 10	2018-07-06 10:22:58 -04:00
Nicole Thomas	776912a74d	Merge pull request #46980 from MTecknology/develop ... Fix broken rendering debian_eth.jinja.	2018-07-06 09:03:31 -04:00
Christophe Vedel	b274ab78a7	support RunOnce in the VMware salt-cloud driver	2018-07-05 22:27:05 +02:00
Nicole Thomas	8731f42829	Merge pull request #48371 from jyurdal/mongo_uri_feature ... mongo_future_return: MongoDb Connection string support	2018-07-05 15:29:20 -04:00
Nicole Thomas	2baa7f189f	Merge pull request #48431 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-05 13:22:59 -04:00
Nicole Thomas	ff9f300563	Merge pull request #48430 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-05 13:22:38 -04:00
Nicole Thomas	593e7db501	Merge branch 'develop' into develop	2018-07-05 12:33:00 -04:00
Nicole Thomas	432cbbb5ee	Merge pull request #48310 from mtorromeo/ini-manage-backports ... Backport ini_manage fixes to 2018.3	2018-07-05 12:27:18 -04:00
Erik Johnson	269dbab7f6	Improve error message when ext_pillar is incorrectly formatted ... This catches a TypeError and adds a sane error message to the pre-flight check.	2018-07-05 11:11:10 -05:00
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	1c45c670d8	Lint: Remove extra blank lines	2018-07-05 11:16:16 -04:00
Nicole Thomas	84fd3d2784	Merge pull request #48441 from terminalmage/issue48402 ... Switch init system log message to debug	2018-07-05 10:43:24 -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
Bo Maryniuk	526a7b1200	Do not call VT terminal if no command or an empty password passed.	2018-07-05 15:57:55 +02:00
Eugene Davis	91d5b58630	Fix collision in influxdb_user.py for client_args password and user password	2018-07-05 13:09:08 +02:00
Eugene Davis	ca3e0b07ff	Remove name collision for password for user creation and password setting	2018-07-05 13:03:32 +02:00
Joanna Yurdal	295f964baa	mongo_future_return: uri config error handling	2018-07-05 11:38:50 +02:00
Joanna Yurdal	ab73e84979	mongo returners use LooseVersion	2018-07-05 10:45:53 +02:00
Joanna Yurdal	650f2374b1	mongo_future_return: Update documentation	2018-07-05 10:45:48 +02:00
Joanna Yurdal	b51d5d7323	mongo_future_return: MongoDb Connection string support	2018-07-05 10:23:48 +02:00
Erik Johnson	d758995763	Switch init system log message to debug ... This prevents unnecessarily info logging when running Salt in environments without an init system (e.g. Docker).	2018-07-04 22:44:23 -05: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
slivik	88f80fdf77	Fixed pylint useless-super-delegation warning.	2018-07-04 09:20:10 +02:00
Massimiliano Torromeo	e20f4cacd4	Uniformed reports between ini.options_absent and ini.options_present	2018-07-04 09:20:04 +02:00
slivik	2c3ae0b6c9	pylint cosmetics.	2018-07-04 09:19:58 +02:00
slivik	0c0d10d18f	Fixes dry run false positive when option value is a number.	2018-07-04 09:19:52 +02:00
slivik	70144bccbb	Fixes dry run in ini_manage + Fixes related bug - when working with options which are not in section. + Fixes related tests + Fixes pylint warnings	2018-07-04 09:19:36 +02:00
rallytime	3e59dda0b1	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-07-03 16:09:28 -04:00
rallytime	b55aa5b946	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/rabbitmq.py - salt/netapi/rest_tornado/saltnado.py	2018-07-03 16:07:46 -04:00