Commit Graph

49904 Commits

Author SHA1 Message Date
twangboy
d4c8e30f5d Fixed problem with add/remove path 2015-09-15 15:36:51 -06:00
Mike Place
f5c3f157dd Merge pull request #27128 from eguven/2015.5-fix-test-diff
don't show diff for test run if show_diff=False
2015-09-15 08:11:55 -06:00
Eren Güven
ec2d68a84a don't show diff for test run if show_diff=False 2015-09-15 12:43:44 +02:00
Justin Findlay
088b1dbb3e Merge pull request #27116 from jacobhammons/release-docs-2015.5
Update latest to 2015.8, 2015.5 is now previous
2015-09-15 01:34:27 -06:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne
Merge #27019
2015-09-15 01:32:17 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Mike Place
35fc74132a Merge pull request #26942 from Arabus/fix-docker.run
Fix docker.run
2015-09-14 12:10:53 -06:00
Mike Place
59f2a0c7ae Merge pull request #26977 from abh/2015.5-ntppeer
Add support for PEERNTP network interface configuration
2015-09-14 11:59:00 -06:00
Mike Place
e05b1f3951 Merge pull request #27023 from jfindlay/htwebutilpass
add test support for htpasswd state mod
2015-09-14 11:48:00 -06:00
Mike Place
9f999c0027 Merge pull request #27074 from twangboy/fix_password_2015.5
Replaced password with redacted when displayed
2015-09-14 10:27:26 -06:00
Justin Findlay
46b44f85ed Merge pull request #27073 from rallytime/remove-lxc-warning
Remove "use develop branch" warning from LXC tutorial
2015-09-11 17:51:06 -06:00
twangboy
fdd3537456 Replaced password with redacted when displayed 2015-09-11 16:39:47 -06:00
Justin Findlay
caab21d99c Merge pull request #27054 from rallytime/bp-27029
Back-port #27029 to 2015.5
2015-09-11 16:29:45 -06:00
Justin Findlay
0227e1cb57 Merge pull request #27053 from rallytime/bp-26992
Back-port #26992 to 2015.5
2015-09-11 16:29:30 -06:00
Justin Findlay
b72a0ef86d Merge pull request #27052 from rallytime/bp-26930
Back-port #26930 to 2015.5
2015-09-11 16:28:11 -06:00
Justin Findlay
8b554dd16f Merge pull request #27049 from johanek/repoquery-dedupe
Run repoquery less
2015-09-11 16:26:12 -06:00
rallytime
76c056d02b Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released 2015-09-11 16:05:28 -06:00
Joseph Hall
cc2cbf9869 Merge pull request #27070 from stanislavb/2015.5
Deprecate salt.utils.iam in Carbon
2015-09-11 16:01:57 -06:00
Stanislav Blokhin
1e6e5ddc9c Deprecate salt.utils.iam in Carbon
salt.utils.aws has more feature complete methods to retrieve same data
2015-09-11 22:35:09 +02:00
Nicholas Caley
0be393be22 Removed check for no package name
When a pkg name is not specified, this should just run `npm install --json`. The check that was removed prevented this from happening and also prevented the 'npm.bootstrap' state from working correctly.
2015-09-11 09:20:31 -06:00
Thayne Harbaugh
83798aff3c Do not use full return for documentation. 2015-09-11 09:19:19 -06:00
Thayne Harbaugh
d9d5bbaa68 Summary requires full return information. 2015-09-11 09:19:18 -06:00
Paul Morelle
d9787aa318 aptpkg.mod_repo: Raise when key_url doesn't exist
_cmd_quote would raise with unexplicit error if _fn = False
2015-09-11 09:17:43 -06:00
Nicole Thomas
e23caa8ccf Merge pull request #27030 from jfindlay/winreg
Backport #26938
2015-09-11 09:10:45 -06:00
Johan van den Dorpe
c113916a23 When running repoquery to check for available versions of packages, run once for all packages rather than once per package 2015-09-11 14:09:13 +01:00
Pedro Algarvio
843c28b435 Merge pull request #27025 from cachedout/issue_25581
Better try and error handling for prep_jid
2015-09-11 08:40:10 +01:00
Pedro Algarvio
b9baa0b39a Merge pull request #27035 from terminalmage/useradd-contextmanager
useradd.py: Use contextmanager to prevent leaked filehandles
2015-09-11 08:39:41 +01:00
Erik Johnson
e430e97f6c Update user states to reflect changes to login class handling 2015-09-10 17:57:38 -05:00
Erik Johnson
f24b979c7c useradd.py: Use contextmanager to prevent leaked filehandles
This also makes some optimizations by not assigning the output of
functions to variables when unnecessary, and changes this module to pass
arguments to the cmd.run functions as list instead of a string.

It also changes some weird behavior for the loginclass functions.
There's no reason to return a dictionary that will only have one
element, and there is no reason to return a string that is literally
just two quotes (i.e. '""') when there is no login class found. An empty
string is sufficient, and has the benefit of also evaluating as False as
a boolean.
2015-09-10 17:57:38 -05:00
Joseph Hall
1cdfdf7a92 Merge pull request #27034 from rallytime/softlayer-doc-fix
Update softlayer docs for where to find apikey
2015-09-10 16:29:56 -06:00
rallytime
cb641f8145 Update softlayer docs for where to find apikey 2015-09-10 16:23:47 -06:00
Justin Findlay
391a09d5ac update reg state unit tests 2015-09-10 16:16:15 -06:00
Justin Findlay
120fbe78e0 remove trailing line in win_path exec module 2015-09-10 15:17:46 -06:00
Justin Findlay
b36a7107b2 update win_path exec module unit tests 2015-09-10 15:17:46 -06:00
Philipp Weißmann
a2dc6f2dd7 Fixes win_path module, migrates from reg.(set|get)_key to reg.(set|get)_value 2015-09-10 15:17:46 -06:00
Justin Findlay
9e06d3f01a Merge pull request #27024 from rallytime/bp-27004
Back-port #27004 to 2015.5
2015-09-10 15:14:20 -06:00
Justin Findlay
9ab2cae1e4 Merge pull request #27027 from rallytime/bp-27013
Back-port #27013 to 2015.5
2015-09-10 15:13:52 -06:00
Justin Findlay
2c8beb238f Merge pull request #27026 from rallytime/bp-27011
Back-port #27011 to 2015.5
2015-09-10 15:13:45 -06:00
Bernd May
e61e1de1f5 Fixes value typo for dockerio.loaded state 2015-09-10 23:03:45 +02:00
Justin Findlay
e8cdcc62f7 Merge pull request #26972 from twangboy/fix_20522
Catch the 404 error from fileclient
2015-09-10 14:53:12 -06:00
Justin Findlay
fbc95f4685 Merge pull request #26951 from terminalmage/fix-timezone
Fix timezone module for CentOS
2015-09-10 14:46:07 -06:00
Nitin Madhok
19a6e9cb1c Remove unwanted debug statement. 2015-09-10 13:40:34 -06:00
Seth House
f8518d545f Move giant eventlisten.sh example out of the state.event docstring
This is more interesting than directly useful and doesn't need to
clutter the docs.
2015-09-10 13:38:09 -06:00
Justin Findlay
f2ad3c333c Merge pull request #26875 from marccardinal/patch-2
LXC gateway provisioned only when IP is provided
2015-09-10 13:31:32 -06:00
Mike Place
ecc09d9b93 Lint 2015-09-10 13:21:49 -06:00
Mike Place
bfcaab9ef4 Better try and error handling for prep_jid
Implement upper bounds for retries on FS errors when writing job files to cache.

Raise exceptions up to clients and daemons for logging and user notification.

Handle exception outlined in #25581.
2015-09-10 13:15:30 -06:00
David Boucha
7b2e7b1b37 Merge pull request #26997 from twangboy/fix_symlink_windows
Fixed symlinks for windows (don't use user root)
2015-09-10 13:54:50 -05:00
turnred
54d6fcf4c7 Fix 'dict' object has no attribute split
Remove trailing whitespace
2015-09-10 12:46:44 -06:00
turnred
bb29d73c71 Fix 'dict' object has no attribute split
Fixing mixed result
2015-09-10 12:46:44 -06:00