81083 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	bc70772f9d	Merge pull request #40689 from jbadson/fix-syslog-returner ... Fixes bug that prevents syslog returner from working under Python 2.6	2017-04-14 04:45:12 -06:00
Mike Place	983d35ad38	Merge pull request #40690 from thor/2016.11-tomcat ... Fixes #40658: even clearer and working(!) Tomcat version handling	2017-04-14 04:44:01 -06:00
Mike Place	d58f53ae6a	Merge pull request #40693 from xetus-oss/boto-ec2-add-private-ip-management-states ... Add states to ensure an ENI has private ips present or absent.	2017-04-14 04:35:26 -06:00
Mike Place	6b2e6b0da2	Merge pull request #40692 from twangboy/fix_cmdmod_py3 ... Change method of getting system drive letter	2017-04-14 04:24:41 -06:00
Thor K. H	09145ea1a5	Fixes unindexed strfmt curly braces for python 2.6	2017-04-14 08:51:16 +01:00
Arthur Meneau	03e286fb51	whitespace change only, addresses the items pylint found	2017-04-13 21:39:42 -07:00
Arthur Meneau	4f847e9158	Add states to ensure an ENI has private ips present or absent.	2017-04-13 16:50:54 -07:00
twangboy	f15de66350	Change method of getting system drive letter	2017-04-13 17:43:13 -06:00
Walter Goulet	2197eda449	Configured final production URL as default in venafiapi.py	2017-04-13 19:02:08 -04:00
Nicole Thomas	5569798d2a	Merge pull request #40679 from rallytime/merge-nitrogen ... [nitrogen] Merge forward from 2016.11 to nitrogen	2017-04-13 16:19:09 -06:00
Ch3LL	9ea6e8b456	remove io and change to EROFS	2017-04-13 18:10:44 -04:00
Thor K. H	b78fc46b91	Fixes #40658: clearer version handling ... A few minor improvements/fixes to the clarity of version handling from both the states view, and the module. Firstly, the main culprit: the module's check for the passed version parameter was too strict, and would only work when the version was explicitly True. This would never work for a string. This has been changed to simply check if it's "true"-ish: if no parameter is passed, the default is True, and it'll try to guess a version number. If you pass a specific version, then it'll use that. Should you pass False, or an empty string, it'll be viewed as blank, which was the initial intent. It's not that *that* didn't work, it's just that the other part didn't, which means no version at all did. *cough* Besides that, it's a bit clearer with different default named parameter values for 'version', that doesn't otherwise change the behaviour in any reasonable backwards way. A blank version for a Tomcat version is nonsensical, per Apache's documentation. https://tomcat.apache.org/tomcat-8.0-doc/config/context.html#Naming Otherwise, it's all minor with an actual type checker before sending it along in the module. Plus, there was a minor mistake in the documentation for the state.	2017-04-13 23:06:20 +01:00
Jim Adson	e5a3a7d217	Fixes bug that prevents syslog returner from working under Python 2.6 ... Fixes #40688	2017-04-13 15:33:54 -06:00
Ch3LL	688791ff60	remove try-except and change errno	2017-04-13 17:06:44 -04:00
Mike Place	3cd9a50b22	Merge pull request #40686 from twangboy/fix_service ... Fix 'salt-minion' service for Win 10 Creators Update 1703	2017-04-13 14:00:12 -06:00
Mike Place	10f60c2742	Merge pull request #40664 from gtmanfred/develop ... wake on lan match with grains cache	2017-04-13 13:59:19 -06:00
Mike Place	ad4d6839fd	Merge pull request #40675 from gtmanfred/2016.11 ... use loader for getting war version	2017-04-13 13:58:30 -06:00
Mike Place	7ea526f59e	Merge pull request #40680 from rallytime/bp-40598 ... Back-port #40598 to 2016.11	2017-04-13 13:58:16 -06:00
Mike Place	dccc789a7e	Merge pull request #40683 from gtmanfred/nitrogen ... make a list of kwargs keys	2017-04-13 13:57:15 -06:00
twangboy	b6ac4aa86d	Fix service for win10 update	2017-04-13 13:51:15 -06:00
rallytime	e440d2e8af	Use self.setGrains as context manager in grains test	2017-04-13 13:39:11 -06:00
Mike Place	db68df23dd	Merge pull request #40681 from cachedout/status_beacon ... Allow status beacon to run on all operating systems	2017-04-13 13:33:10 -06:00
Nicole Thomas	39dd6e284d	Merge pull request #40678 from Ch3LL/fix_mac_fstype ... fix test_fstype test for mac	2017-04-13 13:20:31 -06:00
Nicole Thomas	88f514835d	Merge pull request #40677 from rallytime/merge-develop ... [develop] Merge forward from nitrogen to develop	2017-04-13 13:19:07 -06:00
Ch3LL	e30afc4c01	add exception type	2017-04-13 15:06:12 -04:00
Daniel Wallace	b1da5ab873	wake on lan match with grains cache	2017-04-13 12:57:22 -06:00
Ch3LL	acf333df08	change errno code for fileclient test	2017-04-13 14:56:45 -04:00
rallytime	3d6c983c69	Remove unused import for lint	2017-04-13 11:52:20 -06:00
Daniel Wallace	a61fc824c4	use loader for war extraction ... Also set the version added in the docs	2017-04-13 11:51:22 -06:00
Mike Place	cc1643eb1f	Fix netapi lint	2017-04-13 11:40:27 -06:00
Mike Place	cfc282f036	Merge pull request #40684 from cachedout/fix_netapi_lint ... Fix netapi lint	2017-04-13 11:34:12 -06:00
rallytime	ae034a1d67	Pylint fix	2017-04-13 11:33:47 -06:00
Mike Place	54b5415ddd	Fix netapi lint	2017-04-13 11:33:12 -06:00
Daniel Wallace	f6761e6025	make a list of kwargs keys ... kwargs changes size in the for loop, so we need to instantiate a new list of keys for the kwargs Fixes #40682	2017-04-13 11:14:51 -06:00
Mike Place	ecbb0d186f	Allow status beacon to run on all operating systems	2017-04-13 10:32:25 -06:00
Christian McHugh	e790930f5a	re-add batch support to cherrypy saltapi	2017-04-13 10:19:48 -06:00
Christian McHugh	6eec04b2db	pop out of kwargs	2017-04-13 10:19:48 -06:00
Christian McHugh	260dd84758	Create eauth dict for passing into batch class	2017-04-13 10:19:48 -06:00
Christian McHugh	5fb8190d44	Ensure batch uses passed eauth token or credentials	2017-04-13 10:19:48 -06:00
rallytime	17efc7341c	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/win_wua.py - salt/netapi/rest_cherrypy/app.py - salt/version.py - tests/unit/states/grains_test.py - tests/unit/states/test_archive.py	2017-04-13 10:14:51 -06:00
Ch3LL	60724980ec	fix test_fstype test for mac	2017-04-13 12:04:20 -04:00
Mike Place	5668cc39de	Merge pull request #39802 from cachedout/random_startup_delay ... A random startup delay option for minions	2017-04-13 09:53:06 -06:00
rallytime	5282ea2480	Merge branch 'nitrogen' into 'develop' ... No conflicts.	2017-04-13 09:46:05 -06:00
Mike Place	49d7124fe5	Merge pull request #40598 from mchugh19/batch_eauth ... Ensure batch uses passed eauth token or credentials	2017-04-13 09:44:45 -06:00
Mike Place	4690633e0f	Merge pull request #40659 from gtmanfred/ssh ... encode for py3	2017-04-13 09:40:59 -06:00
Mike Place	14a5b43216	Merge pull request #40674 from Juniper/nitrogen ... new functions for junos modules (lock, unlock, load, commit_check) and changes to install_config	2017-04-13 09:36:03 -06:00
rajvidhimar	060974f9b7	Fix doc for junos install_config in state module	2017-04-13 15:35:13 +05:30
rajvidhimar	50a4f94ec0	Add new functions in junos (lock, unlock, load, commit_check) and doc changes	2017-04-13 15:35:13 +05:30
Nicole Thomas	c4d06c8f01	Merge pull request #40647 from The-Loeki/patch-1 ... cache roster doc fixes	2017-04-12 16:33:41 -06:00
Daniel Wallace	bfc34d4825	encode for py3 ... Fixes #40434	2017-04-12 15:32:07 -06:00