88094 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	737433b47f	It works!	2017-11-30 11:05:12 -07:00
Thomas S Hatch	9e0501c3f0	initial add of state system and orchestration pauses	2017-11-30 09:47:31 -07:00
Nicole Thomas	63e4b6970c	Merge pull request #44715 from spenceation/panos-2017-11-28 ... Added new functions PANOS functions.	2017-11-29 14:20:17 -05:00
Nicole Thomas	1855f3fe12	Merge pull request #43783 from garethgreenaway/43647_fix_InitiatorName_in_comments ... [develop] Fix to grains/core.py	2017-11-29 09:05:59 -05:00
spenceation	443f58f2a1	Fixed LINT issues.	2017-11-29 08:33:58 -05:00
Nicole Thomas	061ac1b3ab	Merge pull request #44612 from zachmoody/netbox-module ... Add NetBox execution module	2017-11-29 00:01:41 -05:00
Gareth J. Greenaway	73bae346cd	Swapping logic in _windows_iqn back to previous method to ensure tests pass.	2017-11-28 18:39:12 -08:00
Gareth J. Greenaway	89b546c075	Merge branch 'develop' into netbox-module	2017-11-28 15:25:42 -08:00
Gareth J. Greenaway	5d387d55fc	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-28 13:37:00 -08:00
Gareth J. Greenaway	6ee18e4f38	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-28 13:35:11 -08:00
spenceation	678da78a61	Added new functions: ... - get_dos_blocks - get_local_admins - test_fib_route - test_security_policy	2017-11-28 13:47:17 -05:00
Nicole Thomas	669f037761	Merge pull request #44703 from terminalmage/fix-ssh-test ... Fix ssh state.show_top integration test (develop branch)	2017-11-28 12:41:34 -05:00
Nicole Thomas	7b27873614	Merge pull request #44704 from terminalmage/salt-jenkins-556 ... Fix failing grains test on CentOS	2017-11-28 10:14:30 -05:00
Nicole Thomas	45ad24524d	Merge pull request #44705 from samodid/44651 ... Update salt-cloud lxc driver behavior when target unavailable , fix #44651	2017-11-28 10:12:23 -05:00
Erik Johnson	218d71f68a	Merge pull request #44622 from terminalmage/fix-new-grains ... Fix traceback in new iSCSI IQN grains	2017-11-28 08:38:26 -06:00
Nicole Thomas	a5828d6ad9	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-28 09:17:34 -05:00
Volodymyr Samodid	ba1424ec6f	fix #44651 ... **now salt-cloud lxc driver won't exit if provider target unavalible	2017-11-28 08:12:59 +02:00
Erik Johnson	543d3ef62c	Merge pull request #44700 from eradman/cron_test ... Fix invocation of cron.file with when run with test=True	2017-11-27 22:19:02 -06:00
Erik Johnson	682fc1b884	Fix failing grains test on CentOS ... Resolves https://github.com/saltstack/salt-jenkins/issues/556	2017-11-27 21:37:46 -06:00
Zach Moody	1faa685d9e	fixup pylint import error.	2017-11-27 19:05:51 -06:00
Zach Moody	871a90cbc5	add netbox execution module	2017-11-27 18:59:06 -06:00
Erik Johnson	1f893d1e95	Fix ssh state.show_top integration test ... 63823f3 changed how we handle cases where master_tops and top file matches both exist in a given environment. This updates the test to reflect the correct behavior in develop based on the fact that the master_tops_first config option is set to False. See: https://github.com/saltstack/salt/pull/44697#issuecomment-347373412 and the subsequent comments in that pull request.	2017-11-27 18:50:10 -06:00
Eric Radman	c729eef9e8	Fix invocation of cron.file with when run with test=True	2017-11-27 18:21:03 -05:00
Nicole Thomas	b29300ef68	Merge pull request #44667 from oarmstrong/develop ... Fix acme.cert to run certbot non-interactively	2017-11-27 17:18:27 -05:00
Nicole Thomas	7adc0b5b6f	Merge pull request #43893 from olivier-mauras/saltclass ... SaltClass: Correct when dict is NoneType because of the value doesn't exist	2017-11-27 16:24:25 -05:00
Nicole Thomas	94001ffc64	lint: whitespace fixes	2017-11-27 16:15:44 -05:00
Nicole Thomas	e8298d734d	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-27 15:08:36 -05:00
Nicole Thomas	71209b3d26	Merge pull request #44660 from skjaro/ipset-fix-state-absent-with-entry-options ... Fix state absent in ipset broken by ipset-add-new-options	2017-11-27 15:02:44 -05:00
Nicole Thomas	cae5309752	Merge pull request #44646 from mchugh19/pip-is_installed ... add is_installed function	2017-11-27 14:40:55 -05:00
Nicole Thomas	7b6792744e	Merge pull request #44674 from arthurlogilab/patch-25 ... typo in "def disable", s/enable/disable/ in ret['comment']	2017-11-27 14:27:58 -05:00
Erik Johnson	8ee5e57fee	Merge pull request #44649 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-11-27 11:23:29 -06:00
Nicole Thomas	6bb562b8f7	Merge pull request #44620 from samodid/fix_44595 ... fix for #44595	2017-11-27 11:55:19 -05:00
Nicole Thomas	9e45e4eff9	Lint: Remove extra blank lines	2017-11-27 11:25:05 -05:00
Nicole Thomas	d498155029	Merge pull request #44371 from sjorge/zpoolupdate ... Update zpool module to support new bits	2017-11-27 10:53:06 -05:00
Arthur Lutz	1a9971065a	typo in "def disable", s/enable/disable/ in ret['comment']	2017-11-24 14:07:17 +01:00
Jorge Schrauwen	a94edecc93	Merge branch 'develop' into zpoolupdate	2017-11-23 16:53:41 +01:00
Christian McHugh	ab5520fdf7	add true and false test for is_installed	2017-11-23 14:08:46 +00:00
Ollie Armstrong	4356d022b9	Fix acme.cert to run certbot non-interactively ... Certbot should never be running interactively when executed via Salt, so this patch adds an argument to certbot which informs it to not run interactively. This fixes #42763.	2017-11-23 11:11:42 +00:00
skjaro	1c309c7c4e	Fix state absent broken by ipset-add-new-options PR	2017-11-22 22:06:40 +01:00
rallytime	1dea504f2d	Replace util path references with new ones	2017-11-22 12:44:36 -05:00
rallytime	052b13c98e	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cli/daemons.py - salt/client/ssh/__init__.py - salt/modules/win_pkg.py - salt/netapi/rest_cherrypy/app.py - salt/proxy/fx2.py - salt/utils/__init__.py - salt/utils/jinja.py - salt/utils/napalm.py - salt/utils/path.py - salt/utils/verify.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_service.py - tests/unit/utils/test_verify.py	2017-11-22 12:36:03 -05:00
Nicole Thomas	4e5662543f	Merge pull request #44584 from rallytime/follow-up-43474 ... Handle deprecation path for pki_dir in verify_env util	2017-11-22 11:42:44 -05:00
Nicole Thomas	d6ccf4bb30	Merge pull request #44616 from Ch3LL/nonbase_test ... Add Non Base Environement salt:// source integration test	2017-11-22 11:13:53 -05:00
Nicole Thomas	3ace504c8c	Merge pull request #44617 from Ch3LL/thindir_ssh ... Add ssh thin_dir integration test	2017-11-22 11:12:51 -05:00
Christian McHugh	98f2170bec	add is_installed function	2017-11-22 14:52:07 +00:00
Nicole Thomas	071a1bd65b	Merge branch '2017.7' into thindir_ssh	2017-11-21 22:23:09 -05:00
Nicole Thomas	80b71652e3	Merge branch '2017.7' into nonbase_test	2017-11-21 22:23:00 -05:00
Nicole Thomas	b49d36c258	Merge branch 'develop' into fix_44595	2017-11-21 22:22:42 -05:00
Nicole Thomas	2cd618f99b	Merge pull request #44625 from Ch3LL/delete_key_test ... Add salt-key -d integration test	2017-11-21 22:15:22 -05:00
Nicole Thomas	443dc1e16b	Merge branch '2017.7' into delete_key_test	2017-11-21 17:10:16 -05:00