saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
55660 commits 34 branches 292 tags 802 MiB
Commit graph

55660 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pedro Algarvio
e6df8cbe24 Add allowed choices to output format. 
Since we're using the print function, we can specify the file handler to
user and in this case we choose `sys.stderr`
 2015-07-12 12:27:26 +01:00
Pedro Algarvio
ef75ea068c Lint fixes to tests/modparser.py 2015-07-12 12:22:28 +01:00
Pedro Algarvio
f00aa559e7 Merge pull request #25349 from thatch45/modparser 
Add modparser script
 2015-07-12 12:18:49 +01:00
Thomas S Hatch
50a55eca58 Add output options to modparser 2015-07-11 15:36:58 -06:00
Thomas S Hatch
3f282e21f1 Add modparser script 2015-07-11 15:25:36 -06:00
Justin Findlay
5840c2e06b Merge pull request #25316 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-11 13:29:53 -06:00
Justin Findlay
01dfa10dee Merge pull request #25330 from jacobhammons/doc-updates 
update latest version to 2015.5.3, bug fix in help system
 2015-07-10 12:49:10 -06:00
Jacob Hammons
96c4fb61b8 update latest version to 2015.5.3, bug fix in help system 2015-07-10 10:56:37 -06:00
jacobhammons
4066cf379c Merge pull request #25325 from jacobhammons/win-wua-doc 
Add win_wua module to doc index
 2015-07-10 10:11:08 -06:00
Jacob Hammons
859530397a Add win_wua module to doc index 2015-07-10 09:54:08 -06:00
Seth House
9548e385a5 Merge pull request #25286 from bbinet/pillarstack 
add support for PillarStack ext_pillar
 2015-07-10 09:51:17 -06:00
Justin Findlay
7376ef426d Merge pull request #25309 from davidjb/patch-3 
Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale
 2015-07-10 08:24:08 -06:00
Pedro Algarvio
7a796440c0 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-10 11:16:48 +01:00
Pedro Algarvio
3b3dc78916 Merge pull request #25300 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Fix ordering issue & Added requirements support
 2015-07-10 11:15:38 +01:00
Bruno Binet
eaa8999704 hopefully fix W1699 pylint error 2015-07-10 09:22:47 +02:00
Bruno Binet
7dfd8b59ce whitespace cleanup 2015-07-10 09:00:18 +02:00
Bruno Binet
989175defa use string formatting instead of string substitution 2015-07-10 08:55:54 +02:00
David Beitey
1c133591e2 Format /etc/locale.gen correctly on gen_locale 
Prior to this change, the ``file.replace`` call matches an end-of-line character, which changes a file from:
```
...
# en_US.UTF-8 UTF-8
# en_ZA ISO-8859-1
...
```
to
```
...
en_US.UTF-8 UTF-8# en_ZA ISO-8859-1
...
``` 
which is incorrectly formatted -- the newline char being removed means the whole section after the whitespace is considered the charset.  See http://www.man-online.org/page/5-locale.gen/.

This may fix #24827.
 2015-07-10 15:09:06 +10:00
Thomas S Hatch
a0e585f8f8 Merge pull request #25267 from jfindlay/disk_mod 
Disk module improvements
 2015-07-09 19:30:45 -06:00
Thomas S Hatch
be85147daa Merge pull request #25304 from salekseev/fix-log_handler_fluent 
Fix exessive escaping in fluent log handler
 2015-07-09 19:29:44 -06:00
Thomas S Hatch
4eb62e322d Merge pull request #25283 from jfindlay/win_user 
ensure ret is always defined
 2015-07-09 19:29:24 -06:00
Thomas S Hatch
a2860cb7a9 Merge pull request #25252 from jfindlay/win_fire 
make args optional with default values in win_firewall.delete_rule
 2015-07-09 19:27:50 -06:00
Thomas S Hatch
cf0152a165 Merge pull request #25251 from isbm/isbm-rsync-state 
Rsync state
 2015-07-09 19:27:18 -06:00
Thomas S Hatch
768df4bf17 Merge pull request #25239 from DSRCompany/pillarenv_CR_bugfixes 
Minor bugfixes in pillarenv support
 2015-07-09 19:25:24 -06:00
jacobhammons
cd405b440e Merge pull request #25257 from notpeter/SourceDestCheck 
Document SourceDestCheck added in #25242.
 2015-07-09 17:29:48 -06:00
Stas Alekseev
231edee777 This is to fix exessive escaping produced by sending the dict though 
a JSON processor and instead relies on msgpack.
 2015-07-09 18:46:07 -04:00
Shane Lee
fb717d37f2 Merge pull request #25298 from twangboy/fix_25275 
Continue if profile not found
 2015-07-09 16:38:32 -06:00
Shane Lee
0a7ec11212 Merge pull request #25296 from twangboy/fix_25294 
Fixed file.comment for windows
 2015-07-09 15:08:02 -06:00
twangboy
0e29607e2c More lint (removed import os) 2015-07-09 15:06:48 -06:00
C. R. Oldham
58ca83cda1 Merge pull request #25254 from rallytime/change_beryllium_refs 
Change versionadded/changed references from Beryllium to 2015.8.0
 2015-07-09 15:01:15 -06:00
Pedro Algarvio
1388010187 Remove hardcoded maxDiff 2015-07-09 20:59:59 +01:00
Pedro Algarvio
3adb731abc Fixed ordering issue 2015-07-09 20:57:23 +01:00
twangboy
dc00492dec Fixed some lint 2015-07-09 11:54:15 -06:00
twangboy
b4380c0838 Fixed some lint 2015-07-09 11:52:35 -06:00
twangboy
b71695ab9b Continue if profile not found 2015-07-09 11:43:42 -06:00
Pedro Algarvio
cf071eaffa Add test which asserts proper field ordering 2015-07-09 17:32:50 +01:00
Pedro Algarvio
0fdfd5fc81 Preserve item order if a configuration block is to be flatten 2015-07-09 17:31:46 +01:00
Pedro Algarvio
665c201db8 Add RequirementsItem which will allow conditional requirements in the configuration class 2015-07-09 17:11:41 +01:00
twangboy
d726bb49e0 Fixed file.comment for windows 2015-07-09 09:53:56 -06:00
Justin Findlay
a3e209d538 Merge pull request #25290 from pcdummy/locale-gen_fix 
Simple fix for locale.present on Ubuntu.
 2015-07-09 09:18:02 -06:00
Justin Findlay
fa13f3e1ed Merge pull request #25285 from thusoy/patch-3 
Remove error logging of missing victorops keys
 2015-07-09 09:10:47 -06:00
Bo Maryniuk
70a7f55146 Fix lint 2015-07-09 16:28:31 +02:00
Bo Maryniuk
a4d1a92d6f Add version 2015-07-09 16:28:20 +02:00
Nicole Thomas
06347f3900 Merge pull request #25266 from ruzarowski/2015.8-SourceDestCheck 
cloud: EC2 eni property SourceDestCheck is a AttributeBooleanValue
 2015-07-09 07:29:07 -06:00
René Jochum
18cff0f454 Simple fix for locale.present on Ubuntu. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-09 13:41:46 +02:00
Bruno Binet
7af1332bf2 remove installation section now that PillarStack comes with salt 2015-07-09 12:18:59 +02:00
Bruno Binet
aeb18beb4f import PillarStack doc from upstream repository readme 2015-07-09 12:17:35 +02:00
Tarjei Husøy
3a8ad1ea97 Remove error logging of missing victorops keys 
Similar to https://github.com/saltstack/salt/pull/24868
 2015-07-09 12:09:10 +02:00
Bruno Binet
cbc460059d import PillarStack ext_pillar from upstream repository 
wget https://raw.githubusercontent.com/bbinet/pillarstack/master/stack.py
 2015-07-09 12:03:38 +02:00
Pedro Algarvio
718c874fdd Merge pull request #25216 from jfindlay/bsd_srv 
replace shell code with native python code
 2015-07-09 10:58:44 +01:00