rallytime
458a544d83
Add OpenBSD installation documentation to 2015.5 branch
2015-10-20 09:13:28 -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
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
jacobhammons
de727d8bd2
Merge pull request #28031 from jacobhammons/relnotes6
...
Updated release notes with additional CVE information
2015-10-16 10:19:37 -06:00
Jacob Hammons
05927bb6f0
Updated release notes with additional CVE information
2015-10-16 10:18:42 -06:00
twangboy
2bcac93314
Fixed win_path.py
...
Moved vdata and split to the same line
No need to check for string types
2015-10-16 09:36:12 -06:00
Mike Place
16c0272849
Merge pull request #28008 from jfindlay/host_path
...
platform independent line endings in hosts mod
2015-10-16 07:20:28 -06:00
Mike Place
d41018fa8e
Merge pull request #28012 from rallytime/fix-28010
...
Clean up stack trace when something goes wrong with minion output
2015-10-16 06:40:59 -06:00
rallytime
0d7059e0c2
Clean up stack trace when something goes wrong with minion output
...
Fixes #28010
2015-10-16 05:13:52 -06:00
Justin Findlay
9f7047dd3c
platform independent line endings in hosts mod
...
Fixes #27897 .
2015-10-16 00:11:39 -06:00
rallytime
f8380d751e
Provide empty string as default stdout instead of None
2015-10-15 16:19:08 -06:00
Colton Myers
f728307001
Merge pull request #27995 from jacobhammons/pillar-doc
...
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:15:31 -06:00
rallytime
f9406b5828
Don't fail if pip package is already present and pip1 is installed
...
Refs #21845
2015-10-15 15:11:21 -06:00
Jacob Hammons
2870af2ba3
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:05:35 -06:00
Mike Place
efede904a7
Merge pull request #27986 from jacobhammons/dot6
...
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:25:41 -06:00
Jacob Hammons
bb61c68c11
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:19:11 -06:00
Mike Place
831ec680d9
Merge pull request #27913 from pass-by-value/proxmox_verify_ssl
...
Set default
2015-10-14 08:03:36 -06:00
Aditya Kulkarni
0b721efe37
Set default
2015-10-13 16:15:42 -04:00
Mike Place
41cccb3a30
Merge pull request #27876 from terminalmage/git_pillar-AttributeError-2015.5
...
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
2015-10-13 08:58:45 -06:00
Erik Johnson
07794c837a
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
...
If the new gitfs-backed git_pillar configuration schema is used, the
Maintenance process will endlessly crash and restart itself because of a
traceback raised when parsing the ext_pillar configuration. This commit
fixes that by catching the AttributeError and logging an error to the
master log.
2015-10-12 14:30:20 -05:00
Mike Place
c9c3b7760e
Merge pull request #27726 from jfindlay/hashhosts
...
deprecate hash_hostname in favor of hash_known_hosts
2015-10-12 10:19:09 -06:00
Mike Place
18e31584b0
Merge pull request #27776 from jfindlay/local_msg
...
return message when local jobs_cache not found
2015-10-12 10:11:41 -06:00
Mike Place
86cc7b5537
Merge pull request #27766 from jfindlay/debmail
...
better check for debian userdel error
2015-10-12 09:14:33 -06:00
Mike Place
c224386c9a
Merge pull request #27758 from iggy/patch-1
...
Remove redundant text from syslog returner
2015-10-12 09:09:49 -06:00
Mike Place
34a005041f
Merge pull request #27841 from terminalmage/issue27832
...
Detect Manjaro Linux as Arch derivative
2015-10-12 08:53:46 -06:00
Mike Place
3944a498ad
Merge pull request #27852 from rallytime/bp-27806
...
Back-port #27806 to 2015.5
2015-10-12 08:53:17 -06:00
Devon Stewart
a84bf18bc4
Empty string is falsy
2015-10-10 17:13:50 -06:00
Mike Place
7508a1c474
Merge pull request #27838 from basepi/fix.runner.highstate.outputter.27831
...
[2015.5] Fix highstate outputter for jobs.lookup_jid
2015-10-09 16:26:28 -06:00
Erik Johnson
8e09fbd6a3
Detect Manjaro Linux as Arch derivative
...
Fixes #27832 .
2015-10-09 16:53:38 -05:00
