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

62798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
a9932d8ff3 Merge pull request #29395 from devopsbrett/patch-1 
Update consul_pillar.py
 2015-12-04 08:05:00 -07:00
Mike Place
eff4ff0a23 Merge pull request #29403 from techhat/nonrhip 
Add IP module for non-RH/Deb Linux platforms
 2015-12-04 08:04:07 -07:00
Mike Place
87dcf708e6 Merge pull request #29404 from techhat/iwtools 
Support for Wireless Tools for Linux
 2015-12-04 08:02:07 -07:00
Mike Place
4099800148 Merge pull request #29415 from michaelcoyote/develop 
add reasons for __virtual__() in boto_ec2.py
 2015-12-04 08:00:48 -07:00
Mike Place
c685210cfd Merge pull request #29424 from arthurlogilab/patch-15 
typo fix
 2015-12-04 07:59:05 -07:00
Arthur Lutz
62e092249c typo fix 2015-12-04 11:57:39 +01:00
jacobhammons
911ce5efe4 Merge pull request #29419 from jacobhammons/release-versions 
Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes
 2015-12-03 20:15:05 -07:00
Jacob Hammons
c2dc709bce Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes 2015-12-03 20:14:16 -07:00
michael guldan
18bd8903cd spelling fix 2015-12-03 16:17:23 -08:00
michael guldan
b53da0eb4b Add return messages on boto library load failure 
lines for library not avalible and wrong version added.
 2015-12-03 16:07:19 -08:00
Mike Place
6d2a21a085 Merge pull request #29413 from cachedout/fixup_29216 
Catch zero-size file with mmap in Python 2.6
 2015-12-03 14:26:47 -07:00
Mike Place
2c342e8c7d Catch zero-size file with mmap in Python 2.6 
Refs #29216
 2015-12-03 14:26:00 -07:00
Mike Place
52c0b6b130 Merge pull request #29408 from twellspring/boto_doc_updates 
Documentation update for boto_vpc changes in #227728
 2015-12-03 13:59:32 -07:00
Mike Place
8fcccf1da0 Merge pull request #29411 from cachedout/fix_augeas_cfg_test 
Fix augeas_cfg test
 2015-12-03 13:56:46 -07:00
Mike Place
af1c327461 Fix augeas_cfg test 2015-12-03 13:54:43 -07:00
Mike Place
a1d7617487 Merge pull request #29406 from sjorge/module-nagios 
minor fixups to salt.modules.nagios
 2015-12-03 13:41:28 -07:00
Joseph Hall
5cc503f928 Import zip from six 2015-12-03 13:39:36 -07:00
Mike Place
e0575d6c76 Merge pull request #29397 from jacksontj/concurrent 
More fixes for #23373
 2015-12-03 13:38:07 -07:00
Mike Place
a099e0855f Merge pull request #29371 from cro/tls-entropy-16744 
Change TLS certificate serial number generation to have more entropy
 2015-12-03 13:29:45 -07:00
Mike Place
10c8d5abf4 Merge pull request #29401 from twangboy/dsc_edit_3 
Dsc edit 3
 2015-12-03 13:28:14 -07:00
Mike Place
717d2885db Merge pull request #29409 from syedaali/virt_ret 
modules.boto_asg.py:__virtual__ return err msg
 2015-12-03 13:17:43 -07:00
Joseph Hall
8660f2e210 Remove unused import 2015-12-03 13:13:12 -07:00
Joseph Hall
8451053702 Lint 2015-12-03 13:12:02 -07:00
Syed Ali
a94b1a3809 modules.boto_asg.py:__virtual__ return err msg 2015-12-03 12:03:11 -08:00
Todd Wells
46cfd57030 Document update for boto_vpc changes in #227728 2015-12-03 11:57:03 -08:00
Jorge Schrauwen
7019b4da14 Use constant for isdir check 2015-12-03 19:51:57 +00:00
Jorge Schrauwen
0bcfcdf5ec move example to correct function 2015-12-03 19:50:58 +00:00
twangboy
4c413e0334 Fixed some lint 2015-12-03 12:10:36 -07:00
Joseph Hall
64ddd84303 Support for Wireless Tools for Linux 2015-12-03 11:45:53 -07:00
Joseph Hall
332dd3d3b9 Add IP module for non-RH/Deb Linux platforms 2015-12-03 11:43:03 -07:00
Brett Mack
d4f9e2b6ee Removed extra line 2015-12-03 18:27:53 +00:00
C. R. Oldham
46d53a2764 Missing import 2015-12-03 11:06:03 -07:00
Mike Place
94f1d07854 Merge pull request #29368 from syedaali/virt_ret 
modules.at:__virtual__ return err msg
 2015-12-03 10:52:07 -07:00
twangboy
54a8468704 fix get_config 2015-12-03 10:36:00 -07:00
Thomas Jackson
d968d69805 Fix variable shadowing 
ret was used to pass in returners, but then immediately overwritten as the return for the method. This ended up causing problems because the return dict was being passed downstream as the returners string
 2015-12-03 09:25:30 -08:00
Thomas Jackson
7bb83cc814 Check the formatting of 'ret' before trying .split() on it 
If it was not a string it would stall the return indefinitely.
 2015-12-03 09:25:02 -08:00
C. R. Oldham
a054f6f0de Lint 2015-12-03 10:19:51 -07:00
Brett Mack
98ee81a8e4 Update consul_pillar.py 
In regards to issue #29193
 2015-12-03 17:18:26 +00:00
Mike Place
3fc41757c6 Merge pull request #29340 from RealKelsar/develop 
Replaced LC_ALL by explicit LC_* variables, since it is exceptional h…
 2015-12-03 10:09:10 -07:00
Mike Place
9dbdcef4da Merge pull request #29369 from thatch45/fs_meta 
Start on adding file metadata #2707
 2015-12-03 10:02:25 -07:00
Mike Place
5bfdeebf1e Merge pull request #29375 from daveneeley/WinPowerCfgErrorMessage2 
Add only works on windows error message
 2015-12-03 10:01:13 -07:00
Mike Place
7afd522878 Merge pull request #29339 from jacksontj/develop 
Simplify TCP/IPC wire protocol
 2015-12-03 09:58:41 -07:00
Syed Ali
561c232f47 modules.{at,aws_sys,boto_cfn,boto_dynamodb,boto_elasticache}:__virtual__ return err msg space added 2015-12-03 08:51:31 -08:00
Mike Place
b2315071ea Merge pull request #29393 from jacobhammons/develop 
updated version numbers in documentation
 2015-12-03 09:27:37 -07:00
Mike Place
bbf1556c23 Merge pull request #29322 from nodeintegration/develop 
add http proxy support for tornado
 2015-12-03 09:25:50 -07:00
Jacob Hammons
ebf72924d2 updated version numbers in documentation 2015-12-03 09:21:48 -07:00
Mike Place
27c0312a31 Merge pull request #29366 from AsocPro/smtp_virt 
Add message to the return Falses in the virtual function
 2015-12-03 08:58:13 -07:00
Mike Place
8f33080ad1 Merge pull request #29377 from AsocPro/selinux_virt 
Add error message to return False statements in virtual function
 2015-12-03 08:49:40 -07:00
Mike Place
ef95581b87 Merge pull request #29374 from AsocPro/srvrden_virt 
Add error message to the return False in virtual function
 2015-12-03 08:46:54 -07:00
Lvjiawei
45ea75774d Summary: Add some new neutron api about filewall rule. 
Description: Add list_firewall_rules, show_firewall_rule,
delete_firewall_rule functions in salt/modules/neutron.py.
Add list_firewall_rules, show_firewall_rule, _fetch_firewall_rule,
delete_firewall_rule, _find_firewall_rule_id functions in
salt/utils/openstack/neutron.py
 2015-12-03 23:45:52 +08:00