92095 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
denza	377d0c085f	Merge branch 'develop' of github.com:saltstack/salt into public_private_ip	2018-03-28 05:40:18 +02:00
Nicole Thomas	7874c908ac	Merge pull request #46617 from ogd-software/states-tls-error-handling ... states/tls: add file not found error-handling	2018-03-27 09:20:10 -04:00
Nicole Thomas	eaaee61627	Merge pull request #46024 from zmedico/fix-tagify-join-str ... Trivial bug fixes for tagify and fire_args functions	2018-03-27 09:09:12 -04:00
Martin Paulus	15342553de	states/tls: fix formatting of valid_certificate parameters	2018-03-27 11:59:27 +02:00
Martin Paulus	f5daa4a665	states/tls: define log from logging.getLogger	2018-03-27 11:58:31 +02:00
Nicole Thomas	8b15de4b37	Merge pull request #46542 from DSRCorporation/bugs/sj828_decrypt_gpg_pillar_fix ... Fixed GPG pillar decryption.	2018-03-26 18:04:02 -04:00
Nicole Thomas	f79869f63c	Merge pull request #46602 from samilaine/fix-with-deprecated-decorator ... Fix the @with_deprecated decorator.	2018-03-26 18:02:09 -04:00
denza	ad9009b1c0	Adding a version tag	2018-03-26 23:19:17 +02:00
Nicole Thomas	340d51ee67	Merge branch 'develop' into fix-tagify-join-str	2018-03-26 15:39:22 -04:00
Nicole Thomas	2386bcdd6c	Merge branch 'develop' into bugs/sj828_decrypt_gpg_pillar_fix	2018-03-26 15:28:17 -04:00
Nicole Thomas	b85c2c4494	Merge branch 'develop' into fix-with-deprecated-decorator	2018-03-26 15:25:29 -04:00
Nicole Thomas	5b072595ca	Merge pull request #46625 from nicholasmhughes/fix-azurearm-image-exception-handling ... Fix Azure ARM catching the wrong exception type for image references	2018-03-26 15:22:24 -04:00
Nicole Thomas	5d9ef58bb1	Merge pull request #46607 from rallytime/fix-46473 ... Remove support for template_path in napalm_network module and netconfig state	2018-03-26 15:03:02 -04:00
Nicole Thomas	839c41d4e7	Merge pull request #46714 from cwlinode/patch-1 ... Specify .conf in profile file names on Linode API page	2018-03-26 12:58:46 -04:00
cwlinode	8b8f9125cd	Update linode.rst ... Following this page to store profiles in `cloud.profiles.d/`, `salt-cloud -p linode_1024 linode-instance` returns the error below unless the profile is named with a `.conf` file extension. ``` [ERROR ] Profile linode_1024 is not defined Error: Profile linode_1024 is not defined ```	2018-03-26 11:33:16 -04:00
rallytime	19afef441d	Remove unused salt.utils.versions imports	2018-03-26 10:27:04 -04:00
rallytime	a173246bdf	Remove support for template_path in napalm_network module and netconfig state	2018-03-26 10:27:04 -04:00
Nicole Thomas	533f526ebf	Merge pull request #46710 from rallytime/lint-develop ... Fix lint errors on develop branch	2018-03-26 10:25:01 -04:00
Nicole Thomas	3d48f7ced5	Merge pull request #45411 from ogd-software/cmd_binary_stdin ... Cmd binary stdin	2018-03-26 09:43:31 -04:00
rallytime	57307e4b95	Fix lint errors on develop branch	2018-03-26 09:01:31 -04:00
Martin Paulus	3ce7a707d1	states/tls: add Python logging module import to provide log.error	2018-03-26 09:52:50 +02:00
Dmitry Kuzmenko	0f482b7633	Fixed GPG pillar decryption. ... 1. Returned back the ability to decrypt raw encrypted data containing no begin/end marks. 2. Remove trailing newlines if decrypted in a new 'multi' way implemented in #45781	2018-03-25 19:04:20 +03:00
nicholasmhughes	04af0c0be6	catch type and key errors for image references	2018-03-23 09:29:59 -04:00
Nicholas Hughes	8b998aa3cc	Merge branch 'develop' into fix-azurearm-image-exception-handling	2018-03-23 09:28:15 -04:00
Mike Place	7e5ac41ef6	Merge pull request #46651 from garethgreenaway/schedule_cleanup_new_tests ... [develop] schedule clean up and error tests	2018-03-22 17:44:14 +02:00
Martin Paulus	743fa942aa	states/tls: add log.error in file not found error-handling	2018-03-22 11:28:00 +01:00
denza	fb0aedbff4	Merge branch 'develop' of github.com:StackPointCloud/salt into public_private_ip	2018-03-21 22:43:01 +01:00
Gareth J. Greenaway	2e55374307	Fixing a couple typos.	2018-03-21 14:41:32 -07:00
Gareth J. Greenaway	1ceb83a24b	Adding isinstances checks from #46540	2018-03-21 14:41:32 -07:00
Gareth J. Greenaway	7ce38e6304	Merge remote-tracking branch 'upstream/develop' into develop	2018-03-21 14:35:45 -07:00
Mike Place	7423e9886d	Merge pull request #46604 from skizunov/develop2 ... Send only used log records to MP Logging Listener	2018-03-21 20:41:59 +00:00
Mike Place	36e2db8657	Merge pull request #46605 from rallytime/fix-46469 ... Remove deprecated functions in trafficserver module and state	2018-03-21 20:10:37 +00:00
Gareth J. Greenaway	e0da7c799e	Removing some duplicate code when handling "when" schedule items. Moving tests looking for errors in test_errors. Adding new tests to account for other error situations.	2018-03-21 13:05:59 -07:00
Nicole Thomas	95be4e4700	Merge pull request #46559 from ksofa2/add-netbox-pillar ... Add netbox pillar	2018-03-21 07:51:14 -04:00
Herbert Buurman	e33859356f	Updated stdin_raw_newlines param documentation. Replicated it over all calling functions.	2018-03-21 10:24:48 +01:00
Herbert	90453c9d71	Merge branch 'develop' into cmd_binary_stdin	2018-03-21 10:04:40 +01:00
Kris Steinhoff	93a2caab29	Add NetBox pillar ... Co-authored-by: Kris Steinhoff <steinhof@umich.edu> Co-authored-by: Nicholas Grundler <grundler@umich.edu>	2018-03-20 16:27:34 -04:00
Nicole Thomas	f77f0efef7	Merge pull request #46522 from rallytime/state-deprecations ... Handle some of the state deprecations for Fluorine	2018-03-20 16:15:54 -04:00
Nicole Thomas	4fab24c1a2	Merge pull request #46621 from DSRCorporation/bugs/sj881_ldap_test_fix ... Reverted PR#45859 breaking the test	2018-03-20 16:07:53 -04:00
Nicholas Hughes	fb25f20978	Merge branch 'develop' into fix-azurearm-image-exception-handling	2018-03-20 13:43:38 -04:00
Nicole Thomas	12fd4980a1	Merge pull request #46544 from s0undt3ch/features/schedule-job-func ... Allow running the schedule jobs to run in the foreground.	2018-03-20 13:42:03 -04:00
nicholasmhughes	74cca5e78e	fixes catching the wrong exception type for image references	2018-03-20 11:17:27 -04:00
Dmitry Kuzmenko	778b315add	Reverted PR#45859 breaking the test ... Because I don't understand how that PR works at all. I've opened discussion with the author I'll return it back in a proper way after we'll figure out how it should work.	2018-03-20 17:05:15 +03:00
Nicole Thomas	7036d57e7c	Merge pull request #46562 from bodhi-space/infra6667 ... INFRA-6667 - avoid stack-trace in boto_asg module	2018-03-20 09:43:26 -04:00
Nicole Thomas	de848c5fb9	Merge pull request #46582 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-03-20 09:30:40 -04:00
rallytime	58a0448de0	Remove deprecated functions in trafficserver module and state	2018-03-20 09:27:58 -04:00
Nicole Thomas	a08753b750	Merge pull request #46575 from mbologna/patch-1 ... Fix: decrease loglevel when unable to resolve addr	2018-03-20 09:23:18 -04:00
Nicole Thomas	0e2e501b24	Merge pull request #46609 from garethgreenaway/46593_develop_schedule_present_always_triggers_change ... [develop] fixes to scheduler	2018-03-20 09:20:19 -04:00
Nicole Thomas	a7c93fdd63	Merge branch 'develop' into state-deprecations	2018-03-20 09:18:53 -04:00
Nicole Thomas	f3d7f7d40d	Merge pull request #46586 from rallytime/fix-46468 ... Handle the win_update and win_wua deprecations for Fluorine	2018-03-20 09:17:28 -04:00