Justin Findlay
|
3727d79bad
|
edit mine doc for style and markup
|
2015-09-30 11:40:22 -06:00 |
|
Justin Findlay
|
7e037a4666
|
add doc motivating mine vs grains
Fixes #27518.
|
2015-09-30 11:40:22 -06:00 |
|
Mike Place
|
59c3d5f93e
|
Merge pull request #27515 from jfindlay/suse_fire
save iptables rules on SuSE
|
2015-09-30 10:09:42 -06:00 |
|
Mike Place
|
9b26357b19
|
Merge pull request #27509 from jfindlay/gluster_reason
tell the user why the gluster module does not work
|
2015-09-30 09:49:16 -06:00 |
|
Colton Myers
|
989733ea86
|
Merge pull request #27379 from jfindlay/pip_vars
document and check dict type for pip env_vars
|
2015-09-29 20:56:52 -06:00 |
|
Justin Findlay
|
aee51ffdef
|
document and check dict type for pip env_vars
Fixes #27372.
|
2015-09-29 16:05:23 -06:00 |
|
Colton Myers
|
6d773f66c3
|
Merge pull request #27516 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2015-09-29 11:53:33 -06:00 |
|
Colton Myers
|
a08951f0fa
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
salt/utils/cloud.py
|
2015-09-29 11:52:32 -06:00 |
|
Justin Findlay
|
4460ad2785
|
save iptables rules on SuSE
Fixe #27478.
|
2015-09-29 11:40:33 -06:00 |
|
Justin Findlay
|
1ccda538d2
|
tell the user why the gluster module does not work
Fixes #27460.
|
2015-09-29 10:01:26 -06:00 |
|
Mike Place
|
68d784c3dd
|
Merge pull request #27472 from cachedout/fix_27447
Change recommeded schema for data field in mysql event table
|
2015-09-29 09:49:37 -06:00 |
|
Mike Place
|
ee6e0ed057
|
Merge pull request #27468 from cachedout/fix_27351
Fix 27351
|
2015-09-29 09:35:29 -06:00 |
|
Mike Place
|
a214c7f84e
|
Merge pull request #27479 from aboe76/fix_locale_suse
fix locale on opensuse and suse #27438
|
2015-09-29 09:34:48 -06:00 |
|
Mike Place
|
931f593b51
|
Merge pull request #27483 from rallytime/fix-17103
Outputters should sync to output, not outputters, on the minion.
|
2015-09-29 09:33:08 -06:00 |
|
Mike Place
|
9c2c028953
|
Merge pull request #27484 from rallytime/bp-27434-and-27470
Back-port #27434 and #27470 to 2015.5
|
2015-09-29 09:32:03 -06:00 |
|
rallytime
|
441241eb90
|
Change sync_outputters to sync_output for consistency, but alias sync_outputters
|
2015-09-29 08:16:15 -06:00 |
|
Mike Place
|
5de2ee35ab
|
Minor doc fixup.
Language and grammar changes.
|
2015-09-28 17:19:21 -06:00 |
|
ZhiFeng Hu
|
af656c7e87
|
Doc: copy key to server via ssh-copy-id
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
|
2015-09-28 17:19:09 -06:00 |
|
rallytime
|
105528720b
|
Outputters should sync to output, not outputters, on the minion.
Otherwise, the loader won't pick them up.
Fixes #17103
|
2015-09-28 16:53:53 -06:00 |
|
Nicole Thomas
|
927874d316
|
Merge pull request #27469 from twangboy/fix_27433
Added quotes to version numbers example
|
2015-09-28 15:54:43 -06:00 |
|
Niels Abspoel
|
a8f2dad1be
|
fix locale on opensuse and suse #27438
|
2015-09-28 22:35:41 +02:00 |
|
Mike Place
|
382a53403f
|
Merge pull request #27467 from cachedout/lint_27375
file.managed: check contents_{pillar|grain} result
|
2015-09-28 14:22:16 -06:00 |
|
Mike Place
|
5e745ad6da
|
Change recommeded schema for data field in mysql event table
Closes #27447
|
2015-09-28 13:32:02 -06:00 |
|
Mike Place
|
0bc37c0d41
|
Fix test
|
2015-09-28 12:57:22 -06:00 |
|
twangboy
|
a996ea46e2
|
Added quotes to version numbers example
Fixes #27433
|
2015-09-28 12:52:59 -06:00 |
|
Mike Place
|
4e54a98f5e
|
Lint #27375
|
2015-09-28 12:46:28 -06:00 |
|
Mike Place
|
ed6207a438
|
Merge pull request #27419 from rallytime/fix-9856
Amend error log to include multiple tips for troubleshooting.
|
2015-09-28 11:53:19 -06:00 |
|
Mike Place
|
73fa89edf7
|
Merge pull request #27426 from rallytime/fix-16753
Don't stacktrace if there are conflicting id errors in highstate
|
2015-09-28 08:52:51 -06:00 |
|
Joseph Hall
|
5dd1b70475
|
Merge pull request #27408 from rallytime/fix-27406-for-2015.5
Fix avail_locations function for the softlayer_hw driver in 2015.5
|
2015-09-25 17:34:50 -06:00 |
|
rallytime
|
f6cbd81e66
|
Don't stacktrace if there are conflicting id errors in highstate
Fixes #16753
|
2015-09-25 16:48:33 -06:00 |
|
Colton Myers
|
8f9a3cfbaf
|
Merge pull request #27410 from jacobhammons/doc-updates
Fix css layout Refs #27389
|
2015-09-25 16:38:48 -06:00 |
|
rallytime
|
551396564a
|
Ammend error log to include multiple tips for troubleshooting.
Fixes #9856
|
2015-09-25 13:01:01 -06:00 |
|
rallytime
|
39a4ae5a6c
|
Remove hdd: 19 refs from SL docs - no longer available from SoftLayer.
|
2015-09-25 12:54:25 -06:00 |
|
rallytime
|
de2f9234d3
|
Use correct default for bandwith
|
2015-09-25 12:50:13 -06:00 |
|
rallytime
|
42d8127f79
|
Don't set the optional_products default to a boolean, and then try to loop.
|
2015-09-25 12:43:59 -06:00 |
|
Jacob Hammons
|
a9fdecada1
|
Fix css layout Refs #27389
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
|
2015-09-25 11:25:14 -06:00 |
|
rallytime
|
9d8a3d8303
|
Fix avail_locations function for the softlayer_hw driver in 2015.5
Fixes #27406
|
2015-09-25 11:04:45 -06:00 |
|
C. R. Oldham
|
5262f01325
|
Merge pull request #27335 from rallytime/cloud-logging-7
[2014.7] Fixup salt-cloud logging
|
2015-09-24 14:33:53 -06:00 |
|
rallytime
|
adeb1dcad4
|
Pylint Fix
|
2015-09-24 13:34:18 -06:00 |
|
Justin Findlay
|
278ade52d2
|
file.managed: check contents_{pillar|grain} result
Fixes #27342.
|
2015-09-24 12:04:15 -06:00 |
|
C. R. Oldham
|
3746085587
|
Merge pull request #27336 from rallytime/cloud-logging-five
[2015.5] Fixup salt-cloud logging
|
2015-09-24 09:02:52 -06:00 |
|
C. R. Oldham
|
5a3be10a3e
|
Merge pull request #27358 from lorengordon/escape-search-replacement-text
Escape search replacement text, fixes #27356
|
2015-09-24 07:52:46 -06:00 |
|
Loren Gordon
|
88bb1fbfff
|
Escape search replacement text, fixes #27356
|
2015-09-23 17:42:18 -04:00 |
|
SaltyCharles
|
f9a19720de
|
fix sysctl truncating newline on os x
|
2015-09-23 13:23:20 -07:00 |
|
C. R. Oldham
|
6759f79d6d
|
Merge pull request #27345 from rallytime/docs-for-19236
Allow use of rst header links by separating options out from yaml example
|
2015-09-23 13:48:56 -06:00 |
|
rallytime
|
1d3925bbfb
|
Added version tag for ex_disk_type option
|
2015-09-23 13:08:18 -06:00 |
|
rallytime
|
f23369300c
|
Allow use of rst header links by separating options out from yaml example
Also added docs to use the ex_disk_type option
|
2015-09-23 13:06:25 -06:00 |
|
rallytime
|
588c13783c
|
Salt-cloud logging clean up for windows functions
|
2015-09-23 10:24:31 -06:00 |
|
rallytime
|
9b6000135c
|
[2014.7] Fixup salt-cloud logging
|
2015-09-23 10:24:20 -06:00 |
|
Mike Place
|
c2efb291e2
|
Merge pull request #26903 from bersace/fix-defaults-modules
Review defaults.get
|
2015-09-23 08:52:20 -06:00 |
|