valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,279 Commits 24 Branches 182 Tags 341 MiB
9e11f3aac5
Commit Graph

61279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
9e11f3aac5 Merge pull request #32088 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-23 11:52:37 -06:00
rallytime
59c3b7e82e Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/state.py
 2016-03-23 10:53:20 -06:00
Mike Place
908a7bf5cd Merge pull request #32051 from terminalmage/fix-state-apply-output 
Fix outputter for state.apply
 2016-03-23 10:42:43 -06:00
Mike Place
bc9a899bc8 Merge pull request #32074 from Xiami2012/fix_iptables 
Fix code for proto args in modules.iptables
 2016-03-23 10:37:58 -06:00
Xiami
aae3af7e49 Fix code for proto args in modules.iptables 
In modules.iptables.build_rule:
  Fix incorrect output when providing proto='!tcp'
  Make salt cleverer when both 'protocol' and 'proto' in kwargs.

NOTE: Conflicts in merge commit 000de95 are wrong dealed with.
 2016-03-23 18:19:18 +08:00
Nicole Thomas
3e08dd0a93 Merge pull request #32053 from basepi/fix_rabbitmq 
[2015.8] Fix rabbitmq_user.present tag handling
 2016-03-22 14:33:51 -06:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Colton Myers
bed048e1e7 Remove leftover arg (lint) 2016-03-22 11:50:38 -06:00
Colton Myers
08868cb32a Fix tag handling code for rabbitmq_user.present 2016-03-22 11:16:17 -06:00
Colton Myers
3b6d25b4e9 Remove leading whitespace on tags 
Was converting '[admin, monitoring]' to ['admin', ' monitoring']

Now converts to ['admin', 'monitoring']
 2016-03-22 11:03:57 -06:00
Erik Johnson
7d7cb45565 Fix outputter for state.apply 
Because of an incorrectly configured ``__outputter__`` dunder dict,
``state.apply`` was falling back to the nested outputter. This corrects
the configuration, allowing ``state.apply`` to use the highstate
outputter as intended.
 2016-03-22 11:59:23 -05:00
Mike Place
553ecaca25 Merge pull request #32023 from sbreidba/bugfix_32004 
Move constant declaration into member variable to avoid issues when m…
 2016-03-21 14:18:23 -06:00
Mike Place
65c634d197 Merge pull request #32026 from techhat/decodeout 
Don't require the decode_out file to already exist
 2016-03-21 14:17:05 -06:00
Joseph Hall
f27da41b71 Don't require the decode_out file to already exist 2016-03-21 13:15:31 -06:00
Mike Place
0e66f678d4 Merge pull request #32002 from abednarik/pkg_manjaron_issue31788 
Added Manajro Linux to virtual.
 2016-03-21 11:55:15 -06:00
Skip Breidbach
711a0a9844 Move constant declaration into member variable to avoid issues when modules can't be loaded. 2016-03-21 09:37:57 -07:00
Nicole Thomas
1d4246bfd7 Merge pull request #32019 from rallytime/bp-32012 
Back-port #32012 to 2015.8
 2016-03-21 09:54:31 -06:00
Nicole Thomas
d117db3efb Merge pull request #32015 from ticosax/fix-port-comparison-udp 
[dockerng] Fix ports exposition when protocol is passed.
 2016-03-21 09:22:19 -06:00
Josh Fraser
26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-21 09:08:21 -06:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed. 
fixes #32013
 2016-03-21 10:44:22 +01:00
Nicole Thomas
c72ab6a073 Merge pull request #31999 from jacobhammons/mock-modules2 
Fixes a doc build exception caused by missing mocks for modules.win_dacl
 2016-03-19 09:49:40 -06:00
abednarik
1b052d0a66 Added Manajro Linux to virtual. 
List extended with ManajaroLinux in order su load pacman module.

Fixes #31788.
 2016-03-19 10:54:29 -03:00
Jacob Hammons
31bb573abc Fixes a doc build exception caused by missing mocks for modules.win_dacl 2016-03-18 17:43:36 -06:00
Nicole Thomas
398ab909f0 Merge pull request #31992 from notpeter/2015.8 
salt-cloud: add D2 and G2 EC2 instance types
 2016-03-18 15:37:21 -06:00
Peter Tripp
e3854c8569 D2 and G2 EC2 instance types. 2016-03-18 13:38:49 -07:00
Mike Place
ad8ada7eef Merge pull request #31981 from lloydoliver/linux-disk-grain-fix 
include rotational disks in grains under linux
 2016-03-18 09:54:00 -06:00
Mike Place
9be508e8f0 Merge pull request #31970 from twangboy/fix_win_file 
Add apply_template_on_contents for windows
 2016-03-18 09:37:29 -06:00
Nicole Thomas
810c6dbcbe Merge pull request #31960 from aletourneau/2015.8_ec2-getconsoleoutput 
fixed ec2 get_console_output
 2016-03-18 09:13:47 -06:00
Nicole Thomas
1c7dc364ad Merge pull request #31958 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-18 09:12:43 -06:00
Nicole Thomas
ba5bf62c1a Merge pull request #31957 from rallytime/merge-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2016-03-18 09:12:22 -06:00
Nicole Thomas
a52e3ad7a1 Merge pull request #31972 from terminalmage/zh-584 
Make lack of python-ldap module more explicit when LDAP eauth is enabled
 2016-03-18 09:11:58 -06:00
Lloyd Oliver
9c44604438 include rotational disks in grains under linux 2016-03-18 12:00:29 +00:00
Erik Johnson
1e5639e495 Make lack of python-ldap module more explicit when LDAP eauth is enabled 2016-03-17 21:05:55 -05:00
twangboy
dfeae191c1 Add apply_template_on_contents for windows 2016-03-17 16:40:55 -06:00
Nicole Thomas
b9d0336cf8 Merge pull request #31964 from jfindlay/2015.8 
update 2015.8.8 release notes
 2016-03-17 15:22:04 -06:00
Justin Findlay
b984659678 update 2015.8.8 release notes 2016-03-17 15:07:10 -06:00
Alexandre Létourneau
8305978879 fixed ec2 get_console_output 2016-03-17 15:51:26 -04:00
rallytime
3934c66fce Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-03-17 12:32:42 -06:00
rallytime
1b6ec5d445 Merge branch '2014.7' into '2015.5' 
Conflicts:
 - pkg/windows/installer/Salt-Minion-Setup.nsi
 2016-03-17 12:30:53 -06:00
Nicole Thomas
fefb694104 Merge pull request #31947 from cro/bp-31601 
Move proxymodule assignment earlier in proxy minion init
 2016-03-17 12:14:23 -06:00
Nicole Thomas
a86490ee68 Merge pull request #31948 from rallytime/disable-pylint-error 
Revert "not not" deletion and add comment as to why that is there
 2016-03-17 11:00:22 -06:00
Nicole Thomas
db3af864ae Merge pull request #31952 from rallytime/lint-2015.8 
Fix lint for 2015.8 branch
 2016-03-17 10:59:49 -06:00
rallytime
3e964ec9d4 Fix lint for 2015.8 branch 2016-03-17 10:12:58 -06:00
C. R. Oldham
4eb193edb7 Lint, unrelated but fixed anyway. 2016-03-17 10:05:28 -06:00
C. R. Oldham
d661081016 Lint. 2016-03-17 10:03:38 -06:00
rallytime
86196cd59d Revert "not not" deletion and add comment as to why that is there 2016-03-17 09:39:14 -06:00
C. R. Oldham
59e0a6f923 Dont add this file 2016-03-17 09:10:38 -06:00
C. R. Oldham
c68b968403 Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py 2016-03-17 09:10:38 -06:00
Mike Place
ba73deee46 Merge pull request #31929 from twangboy/fix_build_script 
Fix nsi script to work with new build process
 2016-03-17 08:59:27 -06:00
Mike Place
2d1f2a0c2e Merge pull request #31935 from twangboy/fix_build_script2 
Back port nullsoft build script from 2015.8
 2016-03-17 08:54:50 -06:00