Colton Myers
11d6a2b6ac
Add some docs
2015-10-20 14:42:08 -06:00
Colton Myers
036d767a98
Keep track of recursive nodegroup_comp calls, keep list format if it's recursing
2015-10-20 14:39:32 -06:00
Colton Myers
155634a0aa
Finish thought
2015-10-20 13:40:23 -06:00
Colton Myers
528b16756b
Only expand nodegroups to lists if there is a nested nodegroup
2015-10-20 13:13:24 -06:00
Mike Place
7badd634ae
Merge pull request #28146 from cachedout/lint_dracr
...
Lint dracr.py
2015-10-20 11:55:07 -06:00
Mike Place
8b057f39e8
Lint dracr.py
2015-10-20 11:54:29 -06:00
Mike Place
5f99bd4dc6
Merge pull request #28141 from rallytime/fix-28118
...
Don't use RAM for root disk size in linode.py
2015-10-20 11:32:29 -06:00
Mike Place
7cd0440c33
Merge pull request #28143 from jtand/lint_fix
...
Removed blank line at end of chassis.py
2015-10-20 10:39:35 -06:00
justinta89
427df95515
removed extraneous file
2015-10-20 10:38:41 -06:00
justinta89
1a58283f23
Removed blank line at end of chassis.py
2015-10-20 10:31:31 -06:00
Mike Place
858875e9fd
Merge pull request #28021 from blueyed/recursive-include
...
Handle includes in `include_config` recursively
2015-10-20 10:19:37 -06:00
Mike Place
4dbaec6b0c
Merge pull request #28095 from rallytime/bp-28001
...
Back-port #28001 to 2015.8
2015-10-20 10:18:11 -06:00
Mike Place
572487073c
Merge pull request #28096 from rallytime/bp-28061
...
Back-port #28061 to 2015.8
2015-10-20 10:15:34 -06:00
Mike Place
9ce526260b
Merge pull request #28139 from rallytime/bp-28103
...
Back-port #28103 to 2015.8
2015-10-20 10:15:05 -06:00
rallytime
59f8e41554
Don't use RAM for root disk size in linode.py
...
Fixes #28118
2015-10-20 09:49:05 -06:00
Antoine Jacoutot
bc9159a126
OpenBSD salt package: update list of dependencies.
2015-10-20 09:07:43 -06:00
Mike Place
97dfb00a68
Merge pull request #28098 from jacksontj/2015.8
...
For all multi-part messages, check the headers. If the header is not …
2015-10-20 09:00:08 -06:00
Mike Place
b4875e585a
Merge pull request #28134 from Awingu/2015.8
...
fix unicode pillar values #3436
2015-10-20 08:51:10 -06:00
Erik Johnson
f990a21029
Merge pull request #28076 from redmcg/2015.8
...
Replace option 'i' with an explicit queryformat
2015-10-20 08:59:57 -05:00
Bernard Kerckenaere
53285f7781
fix unicode pillar values #3436
2015-10-20 15:17:46 +02:00
Mike Place
3fdb52d1bf
Merge pull request #28119 from jacksontj/fetch_issue
...
Check if the remote exists before casting to a string.
2015-10-20 06:34:10 -06:00
Mike Place
69ab1d30e2
Merge pull request #28105 from jfindlay/locale_msg
...
add reason for not loading localemod
2015-10-20 06:25:40 -06:00
Mike Place
8db7e016ec
Merge pull request #28108 from cachedout/issue_28074
...
Set logfile permsissions correctly
2015-10-20 06:25:22 -06:00
Thomas Jackson
c012dcc2f6
Check if the remote exists before casting to a string.
...
The bug before was if the origin wasn't specified None would be cast to a string-- which would then be interpreted as True-- which would end up trying to run `git fetch None` which doesn't work :)
2015-10-19 18:22:08 -07:00
C. R. Oldham
1085eeab2b
Merge pull request #27922 from cro/fx2
...
WIP States/Modules for managing Dell FX2 chassis via salt-proxy
2015-10-19 17:29:21 -06:00
Brendan McGrath
07413ec162
Remove unnecessary padding from rpm.info
2015-10-19 15:20:21 -07:00
C. R. Oldham
6ccafa2ae5
Lint
2015-10-19 15:05:24 -06:00
C. R. Oldham
104c3cbe7f
Lint
2015-10-19 14:24:37 -06:00
C. R. Oldham
fe75594737
Lint
2015-10-19 14:21:18 -06:00
C. R. Oldham
479137cef8
Lint
2015-10-19 13:55:00 -06:00
C. R. Oldham
a715803c92
Merge pull request #28104 from pass-by-value/proxy_ssh_docs
...
Add documentation for proxy minion ssh
2015-10-19 13:30:20 -06:00
C. R. Oldham
3712066fc9
More docs.
2015-10-19 13:19:20 -06:00
Mike Place
b416dcc07b
Set logfile permsissions correctly
...
Closes #28074
2015-10-19 13:10:51 -06:00
Justin Findlay
1e75665a9a
add reason for not loading localemod
...
Fixes #28080 .
2015-10-19 11:57:58 -06:00
Aditya Kulkarni
7c8f236115
Add documentation for proxy minion ssh
2015-10-19 13:30:35 -04:00
Thomas Jackson
6d26842925
For all multi-part messages, check the headers. If the header is not your minion-id or a broadcast, drop the message.
...
Fix for #26844
2015-10-19 09:06:27 -07:00
Michael Vogel
cb8a72d580
Fix #28060
...
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
2015-10-19 09:54:12 -06:00
Mike Zeller
ddf8a8d2bb
Cleanup pkgin isatty mess
2015-10-19 09:52:09 -06:00
Mike Place
07cac0b434
Merge pull request #28020 from DSRCompany/issues/27130_loader_deepcopy_fix
...
LazyLoader deepcopy fix.
2015-10-19 07:17:57 -06:00
Mike Place
f884df5d78
Merge pull request #27933 from eliasp/fix-27932
...
Provide all git pillar dirs in `opts[pillar_roots]`
2015-10-19 07:05:54 -06:00
Mike Place
1db6406bef
Merge pull request #28013 from rallytime/bp-27891
...
Back-port #27891 to 2015.8
2015-10-19 06:57:51 -06:00
Mike Place
26b3e01dda
Merge pull request #28018 from rallytime/fix-27938
...
Add example to Writing Grains of how grains can be loaded twice
2015-10-19 06:47:10 -06:00
Mike Place
c6e7dd4812
Merge pull request #28084 from cachedout/lint_28069
...
#28069 with lint
2015-10-19 06:18:38 -06:00
Mike Place
8026212733
Lint
2015-10-19 06:17:27 -06:00
Mike Place
428e64e24d
Merge pull request #28079 from The-Loeki/fix-trace-on-windows-tasks
...
Fix for trace dump on failing imports for win32com & pythoncom 4 win_task
2015-10-19 06:12:11 -06:00
Mike Place
2ac8fd793d
Merge pull request #28081 from The-Loeki/fix-trace-on-keystone-state
...
fix for glance state trace error on import failure
2015-10-19 06:08:47 -06:00
Ronald van Zantvoort
258e11f754
fix for glance state trace error on import failure
2015-10-19 12:44:02 +02:00
Ronald van Zantvoort
869e212e81
Fix for trace dump on failing imports for win32com & pythoncom 4 win_task
2015-10-19 12:32:34 +02:00
Brendan McGrath
4987530986
Replace option 'i' with an explicit queryformat
...
Option 'i' uses a predefined queryformat that is not necessarily compatible with the code used to parse it.
For example: an exception was being thrown on my CentOS 6.7 machines because the default queryformat was placing multiple keys on a signle line.
I have therefore replaced the 'i' option with a hardcoded queryformat to ensure consistancy across all systems.
2015-10-19 01:14:35 -07:00
Dmitry Kuzmenko
5353518623
Fix lint errors
2015-10-19 10:37:27 +03:00
