TheBigBear
71a2952b26
Update win_update.py
2015-09-12 14:25:12 +01:00
TheBigBear
2a554b3ef6
minor edit - conform to other comments
...
minor edit to make it look like other comments here
```
Comment: Search was done with out an error.
Download was done without error.
Install was done without error.
```
2015-09-12 14:21:54 +01:00
Arnold Bechtoldt
b9e5095bf5
add GH issue label SPM to docs
2015-09-12 11:14:26 +02: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
SaltyCharles
e51c53a08b
add os build version grain to OS X minions
2015-09-11 15:55:49 -07:00
twangboy
c0689e3215
Replaced password with redacted when displayed
2015-09-11 16:48:21 -06:00
twangboy
fdd3537456
Replaced password with redacted when displayed
2015-09-11 16:39:47 -06:00
Justin Findlay
cf59a03432
Merge pull request #27064 from twangboy/user_docs
...
Fixed user docs
2015-09-11 16:37:19 -06:00
Justin Findlay
71c12cbf46
Merge pull request #27072 from rallytime/bp-26840
...
Back-port #26840 to 2015.8
2015-09-11 16:35:52 -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
9704222e70
Merge pull request #27069 from rallytime/salt-cloud-key-gen
...
Generate keys in salt.utils.cloud.bootstrap if they're not already there
2015-09-11 16:03:55 -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
Theodore Cowan
d0b9ececa4
Update http.py
...
fix for https://github.com/saltstack/salt/issues/21917
2015-09-11 15:46:11 -06:00
rallytime
9e51eabf16
Switch Rackspace driver to use salt.utils.cloud.bootstrap()
2015-09-11 15:15:39 -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
rallytime
d6a50f76eb
Don't create keys in cli.py for salt-cloud
2015-09-11 14:23:19 -06:00
Papoyan, Nerses
e3175dd7b1
added docstring for find_device function
2015-09-11 15:07:26 -05:00
rallytime
c5754360d4
Generate keys in salt.utils.cloud.bootstrap if they're not already there
2015-09-11 14:04:40 -06:00
Papoyan, Nerses
9315323c22
removed trailing white-spaces
2015-09-11 14:32:50 -05:00
C. R. Oldham
0e7555089f
Merge pull request #27060 from cro/proxy_grains_breakage
...
Fix grains breakage when hosts are not Linux, Windows, or SunOS
2015-09-11 11:28:49 -06:00
twangboy
db03ca198e
Fixed user docs
2015-09-11 11:26:28 -06:00
Nicole Thomas
e252473b7a
Merge pull request #27057 from rallytime/merge-develop
...
Merge branch '2015.8' into develop
2015-09-11 10:30:44 -06:00
Nicole Thomas
8ee87b9f61
Merge pull request #27051 from rallytime/bp-26953
...
Back-port #26953 to 2015.8
2015-09-11 10:28:20 -06:00
Papoyan, Nerses
873227551e
added module and state to handle prodState in zenoss
2015-09-11 11:07:27 -05:00
rallytime
eac9d9aba9
Pylint Fix
2015-09-11 09:49:14 -06:00
rallytime
a0de117a0f
Merge branch '2015.8' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/config/__init__.py
2015-09-11 09:33:21 -06:00
C. R. Oldham
e697326f1b
Don't check for proxy in the individual is_linux/is_windows/etc functions. This breaks too many things.
2015-09-11 09:30:42 -06:00
Nicole Thomas
c56b24b554
Merge pull request #26982 from eguven/fix-showdiff-for-test
...
fix show_diff for test run
2015-09-11 09:22:53 -06: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
dsumsky
453440753c
- fixed pylint warnings
2015-09-11 09:05:58 -06:00
dsumsky
b40dfa459e
- fixed broken caching in S3 ext_pillar module (file_md5 was a list)
...
- added debugging messages
- static parameters are available as module parameters now
2015-09-11 09:05:58 -06:00
twangboy
7e35b13022
Turned multiprocessing on
2015-09-11 08:10:52 -06:00
Eren Güven
977104484f
show diff only if there is diff to show
2015-09-11 16:10:52 +02: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
Adam Barnett
1c27350dd3
Add the ability to manager osx groups
...
Adding in adduser,deluser and members into mac_groups to give the
ability to add,delete and mange user groups on osx
2015-09-11 10:18:35 +01:00
Pedro Algarvio
249f55cd8c
Merge pull request #26864 from terminalmage/fix-git_pillar-tests
...
Only do git_pillar preflight checks on new-style git_pillar configs
2015-09-11 08:47:12 +01:00
Pedro Algarvio
ca5220b8c1
Merge pull request #27006 from s0undt3ch/develop
...
Additional debugging info for when a module does not load because of an exception raised
2015-09-11 08:45:59 +01:00
Pedro Algarvio
c3c5a2c0d8
Merge pull request #27017 from cachedout/issue_25013
...
Avoid starting minion starting if already running
2015-09-11 08:44:44 +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
Evgeny Vereshchagin
134b3a6e89
Use systemd-notify on systems without python2 systemd bindings
2015-09-11 05:01:49 +03:00
Michael Steed
5d2fae8a89
make master job cache index configurable
2015-09-10 17:55:07 -06:00