50216 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	29e9533aab	Stand up a new channel if using salt-call ... Refs #26411	2015-10-23 13:04:11 -06:00
Mike Place	909fa3dc97	Merge pull request #28255 from cachedout/cli_opt ... Add __cli opt	2015-10-23 12:44:30 -06:00
Mike Place	a2408157de	Add __cli opt ... Allows us to know what CLI command we are operating under. Especially useful for detecting uses of salt-call	2015-10-23 12:42:00 -06:00
Mike Place	0fa094ae11	Merge pull request #28213 from rallytime/boto_route53_state ... If record returned None, don't continue with the state. Something went wrong	2015-10-23 07:54:50 -06:00
Mike Place	1768014705	Merge pull request #28238 from basepi/fix.schedule.present.28217 ... [2015.5] Fix schedule.present always diffing	2015-10-23 07:31:32 -06:00
Colton Myers	087a8dc3c2	Only insert enabled if it's a dict	2015-10-22 19:45:56 -06:00
Colton Myers	5b49f41fab	Fix schedule comparison to adjust for 'enabled' being added in schedule.list	2015-10-22 16:43:38 -06:00
Colton Myers	2dc1226ab8	Build new item with 'enabled' if available	2015-10-22 16:42:12 -06:00
rallytime	237d64ff11	If record returned None, don't continue with the state. Something went wrong.	2015-10-22 11:20:00 -06:00
Erik Johnson	ab991d61d9	Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch) ... This is #28210, opened against the 2015.5 branch. This will conflict when merged forward (into 2015.8) because of the git_pillar rewrite, and the 2015.8 side of the conflict should be kept in all conflicts.	2015-10-22 11:14:53 -05:00
Mike Place	bdd48c92de	Merge pull request #28174 from lorengordon/file-replace-multiline ... Add support for multiline regex in file.replace	2015-10-22 08:02:42 -06:00
Loren Gordon	acdef2da60	Update docstrings with new guidance	2015-10-22 08:49:03 -04:00
Loren Gordon	0835b005b7	Use a test that makes the extra file read unnecessary ... The previous test was: * `has_changes = result != r_data.read(filesize)` This test was validating that `result` is not the same as the contents of the file. The only way for `has_changes` to become true at this point in code would be if `pattern` exists in the file (`nrepl > 0`), and if `pattern == repl`. The new test just checks explicitly for this one condition, eliminating the extra file read.	2015-10-22 07:54:03 -04:00
Loren Gordon	6d6121a6e5	Use flags when checking whether content was added previously	2015-10-21 16:55:26 -04:00
Loren Gordon	b25e609e9e	Set flags=8 since now the file is read as a MULTILINE string by default	2015-10-21 16:53:40 -04:00
Mike Place	2225925fb5	Merge pull request #28175 from twangboy/fix_19673 ... Fixes #19673	2015-10-21 14:48:24 -06:00
Loren Gordon	89e8dcdffd	Use finally block to ensure mmap object is closed	2015-10-21 14:59:39 -04:00
Loren Gordon	5aea6647c9	Add support for multiline regex in file.replace ... * use mmap to avoid reading the entire file into real memory * mmap treats the entire file as a single string * `re` functions work when using the multiline flag * `count` parameter works as expected * no need to read line-by-line; should be significantly faster Fixes #7999 Fixes #8051	2015-10-21 14:52:21 -04:00
twangboy	ae8fbb208f	Fixes #19673 ... It was checking if start or end was False. None, 0, and '' evaluate to False so 0 was being evaluated as an invalid parameter for start and end. Changed it to specifically check for None and ''. 0 is a valid value for start and end.	2015-10-21 12:43:33 -06:00
Mike Place	ab18dcf637	Merge pull request #28140 from rallytime/bsd-installation-doc ... Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 10:31:34 -06:00
Mike Place	fad38eb3c3	Merge pull request #28138 from rallytime/bp-28130-sizes-only ... Back-port #28130 EC2 Sizes Only portion to 2015.5	2015-10-20 10:29:09 -06:00
rallytime	458a544d83	Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 09:13:28 -06:00
Mike Place	ce8f858536	Merge pull request #28097 from jacksontj/2015.5 ... For all multi-part messages, check the headers. If the header is not …	2015-10-20 09:00:18 -06:00
rallytime	6ab31e1886	Pylint	2015-10-20 08:54:54 -06:00
Alex Proca	37e4ed58a9	Added missing comma	2015-10-20 08:52:33 -06:00
Bogdan Radulescu	667f5e669f	Added a bunch of instance sizes and updated some outdated ones	2015-10-20 08:52:13 -06:00
Mike Place	9cdb970289	Merge pull request #28117 from rallytime/fix-23655 ... Clean up stacktrace when master can't be reached in lxc cloud driver	2015-10-20 06:41:12 -06:00
Mike Place	bf7ed0a397	Merge pull request #28110 from terminalmage/masterless-mode ... Add explanation of file_client: local setting masterless mode	2015-10-20 06:28:05 -06:00
rallytime	dfb908e405	Clean up stacktrace when master can't be reached in lxc cloud driver ... Fixes #23655	2015-10-19 15:15:42 -06:00
Joseph Hall	a569ef4980	Merge pull request #28109 from rallytime/fix-27940 ... Add created reactor event to lxc cloud driver	2015-10-19 14:32:41 -06:00
Erik Johnson	ed90103124	Add explanation of file_client: local setting masterless mode	2015-10-19 14:56:37 -05:00
rallytime	18b2245611	Add created reactor event to lxc cloud driver ... Fixes #27940	2015-10-19 13:50:06 -06:00
Thomas Jackson	75e04bcbbc	For all multi-part messages, check the headers. If the header is not your minion_id, skip the message ... Fix for #26844	2015-10-19 09:05:31 -07:00
Mike Place	d4604fdb26	Merge pull request #27996 from rallytime/fix-21845 ... Don't fail if pip package is already present and pip1 is installed	2015-10-19 06:59:17 -06:00
Mike Place	28b97c514f	Merge pull request #28056 from rallytime/bp-28033 ... Back-port #28033 to 2015.5	2015-10-19 06:55:10 -06:00
Mike Place	dfc3aaec74	Merge pull request #28059 from rallytime/bp-28040 ... Back-port #28040 to 2015.5	2015-10-18 10:17:29 -06:00
Mike Place	d1fa036b55	Merge pull request #28047 from cachedout/issue_27534 ... Restore FTP functionality to file client	2015-10-18 10:16:46 -06:00
Ethan Erchinger	76a0d4937b	Revert "Allow passing in auth_version, defaulting to 2." ... This reverts commit 31ff2abd03.	2015-10-17 09:38:12 -06:00
Ethan Erchinger	63d5675d34	default auth_version = 2	2015-10-17 09:38:12 -06:00
Ethan Erchinger	8072716888	remove extra spaces	2015-10-17 09:38:12 -06:00
Ethan Erchinger	9770f56f04	cleanup whitespace, default to None to be consistent with profile	2015-10-17 09:38:12 -06:00
Ethan Erchinger	f4adfe98c0	Allow passing in auth_version, defaulting to 2.	2015-10-17 09:38:12 -06:00
Ethan Erchinger	fab1ad39af	Rackspace support for switft module. ... Allow setting auth_version, also don't make `password` a required field, can also use api_key. Pass api_key in kwargs as `key`, that's what's expected in the utils module. Also update notes with those details and a recommendation for using version 1 auth.	2015-10-17 09:38:12 -06:00
twangboy	af2c5ab759	Fixed win_useradd.py ... The real fix. Instead of getting vdata in the calling function, _get_userprofile_from_registry should return just the profile and not a dict full of a bunch of crap. This also fixes the debug log for the _get_userprofile_from_registry function.	2015-10-17 09:28:59 -06:00
Mike Place	fd2ca2df1b	Merge pull request #28032 from twangboy/fix_win_path ... Fixed win_path.py	2015-10-17 09:16:15 -06:00
Mike Place	6ea37ddbca	Context manager	2015-10-17 09:02:58 -06:00
Mike Place	4d6f6bb371	Lint	2015-10-17 08:57:45 -06:00
Mike Place	88c1770be4	Merge pull request #28037 from rallytime/bp-28003 ... Back-port #28003 to 2015.5	2015-10-16 14:59:52 -06:00
Mike Place	59018289dc	Restore FTP functionality to file client ... Closes #27534	2015-10-16 14:51:39 -06:00
twangboy	4fcf51fb1e	Fix PR #26336 ... Problem with the return value from the registry lookup.	2015-10-16 12:20:09 -06:00