Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Mike Place
8e08f39381
Merge pull request #28167 from The-Loeki/patch-1
...
file.serialize needs to add a final newline to serialized files
2015-10-21 11:12:33 -06:00
Ronald van Zantvoort
46bf6d4fa3
Update file.serialize test for Python serialized
...
pprint.pformat seems non-reversible, so just add the newline there as well
2015-10-21 17:12:53 +02:00
Mike Place
559a517ad6
Merge pull request #28168 from rallytime/fix-27855
...
Make sure availability zone gets passed in boto_vpc module when creating subnet
2015-10-21 08:48:02 -06:00
rallytime
50fb77dc50
Make sure availability zone gets passed in boto_vpc module when creating subnet
...
Fixes #27855
2015-10-21 07:39:13 -06:00
Mike Place
dcd90363fe
Merge pull request #28148 from basepi/fix.nodegroup.backwards.compat.24660
...
[2015.8] Only expand nodegroups to lists if there is a nested nodegroup
2015-10-21 07:20:06 -06:00
Ronald van Zantvoort
66831fd087
file.serialize needs to add a final newline to serialized files
...
It's only proper and nice to do.
It shouldn't have any impact other than `cat` playing nice ;)
2015-10-21 14:53:23 +02:00
Colton Myers
053ad408c7
Merge pull request #28155 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-10-20 17:48:41 -06:00
Colton Myers
c4c889f97b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
salt/daemons/masterapi.py
salt/minion.py
2015-10-20 14:47:49 -06:00
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
Nicole Thomas
53dd01fc24
Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change
...
Add clarification to cloud profile doc about host
2015-10-20 13:46:05 -06:00
Colton Myers
155634a0aa
Finish thought
2015-10-20 13:40:23 -06:00
Aditya Kulkarni
bc371c55cd
Add clarification to cloud profile doc about host
2015-10-20 15:17:47 -04: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
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
justinta89
1a58283f23
Removed blank line at end of chassis.py
2015-10-20 10:31:31 -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
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
rallytime
458a544d83
Add OpenBSD installation documentation to 2015.5 branch
2015-10-20 09:13:28 -06:00
Antoine Jacoutot
bc9159a126
OpenBSD salt package: update list of dependencies.
2015-10-20 09:07:43 -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
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
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
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
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
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
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
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
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
C. R. Oldham
6ccafa2ae5
Lint
2015-10-19 15:05:24 -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
C. R. Oldham
104c3cbe7f
Lint
2015-10-19 14:24:37 -06:00
