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
38,950 Commits 24 Branches 182 Tags 341 MiB
5df6a8008c
Commit Graph

38950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Drevet-Droguet
5df6a8008c fix pylint warning 2015-05-11 18:51:34 +02:00
Christophe Drevet-Droguet
d0549e56ba salt-ssh state: fix including all salt:// references 
Fixes #23355
- recursive look into each chunk of state (salt_refs)
- don't break after including the first file of the list (prep_trans_tar)
 2015-05-11 11:01:54 +02:00
Thomas S Hatch
a123a36f05 Merge pull request #23505 from aneeshusa/remove-unused-ssh-config-validator 
Remove unused ssh config validator. Fixes #23159.
 2015-05-09 07:24:15 -06:00
Aneesh Agrawal
90af1672ca Remove unused ssh config validator. Fixes #23159. 2015-05-08 16:47:41 -04:00
Thomas S Hatch
ca2c21a63c Merge pull request #23467 from slinu3d/2014.7 
Added AWS v4 signature support
 2015-05-08 08:36:19 -06:00
Shouguan Lin
0b4081d8f4 Fixed pylint error at line 363 2015-05-07 14:57:44 -07:00
Shouguan Lin
5be5eb5b14 Fixed pylink errors 2015-05-07 13:37:08 -07:00
Mike Place
e6f9eec02e Merge pull request #23444 from techhat/novacreateattach 
Add create_attach_volume to nova driver
 2015-05-07 13:51:32 -06:00
Shouguan Lin
e64f374ffa Fixed lint errors 2015-05-07 12:29:50 -07:00
Justin Findlay
e331463319 Merge pull request #23460 from s0undt3ch/hotfix/bootstrap-script-2014.7 
[2014.7] Update to latest stable bootstrap script v2015.05.07
 2015-05-07 13:10:54 -06:00
Pedro Algarvio
edcd0c41f2 Update to latest stable bootstrap script v2015.05.07 
* Lower required requests version dependency. Use system requests package where possible.
* Allow Ubuntu alternate ppas. Thanks Peter Tripp(notpeter). saltstack/salt-bootstrap#563
 2015-05-07 17:06:38 +01:00
Joseph Hall
ebdb7eae2d Add create_attach_volume to nova driver 2015-05-07 02:02:22 -06:00
Justin Findlay
7a8ce1a954 Merge pull request #23439 from techhat/maxtries 
Add wait_for_passwd_maxtries variable
 2015-05-07 01:28:56 -06:00
Joseph Hall
0ad3ff2c88 Add wait_for_passwd_maxtries variable 2015-05-07 00:24:53 -06:00
Shouguan Lin
b9d1ac4f1f Added AWS v4 signature support 2015-05-06 15:47:37 -07:00
C. R. Oldham
644eb75fec Merge pull request #23422 from cro/gce_sh_home 
$HOME should not be used, some shells don't set it.
 2015-05-06 15:02:36 -06:00
Colton Myers
ef17ab4b2a Merge pull request #23425 from basepi/functionwrapper_typo 
[2014.7] Fix typo in FunctionWrapper
 2015-05-06 14:38:03 -06:00
Colton Myers
c390737f3e Fix typo in FunctionWrapper 2015-05-06 14:37:34 -06:00
C. R. Oldham
4ef9e6ba06 Don't use $HOME to find user's directory, some shells don't set it 2015-05-06 14:33:20 -06:00
Justin Findlay
1b13ec04c2 Merge pull request #23385 from rallytime/bp-23346 
Backport #23346 to 2014.7
 2015-05-06 14:12:29 -06:00
Justin Findlay
f8c7a62089 Merge pull request #23414 from jfindlay/update_branch 
2015.2 -> 2015.5
 2015-05-06 14:04:02 -06:00
Justin Findlay
8074d16d52 2015.2 -> 2015.5 
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
 2015-05-06 11:40:01 -06:00
Seth House
54b3bd43e4 Merge pull request #23404 from hvnsweeting/cherrypy-post-emptybody-fix 
saltapi cherrypy: initialize var when POST body is empty
 2015-05-06 11:35:56 -06:00
Justin Findlay
160f703296 Merge pull request #23409 from terminalmage/update-lithium-docstrings-2014.7 
Update Lithium docstrings in 2014.7 branch
 2015-05-06 10:20:46 -06:00
Erik Johnson
bc97d011ba Fix sphinx typo 2015-05-06 09:31:19 -05:00
Erik Johnson
20006b06f6 Update Lithium docstrings in 2014.7 branch 2015-05-06 09:12:37 -05:00
Viet Hung Nguyen
f85f8f954c initialize var when POST body is empty 
or lowdata_fmt will raise exception
 2015-05-06 12:02:14 +07:00
Thomas S Hatch
aa5fb0aa46 Merge pull request #23397 from jfindlay/fix_locale_gen 
add more flexible whitespace to locale_gen search
 2015-05-05 21:44:10 -06:00
Justin Findlay
0941fefd2b add more flexible whitespace to locale_gen search 
Fixes #17245.
 2015-05-05 17:10:15 -06:00
Justin Findlay
0c76dd4d8a Merge pull request #23368 from kaithar/bp-23367 
Backport #23367 to 2014.7
 2015-05-05 15:42:26 -06:00
Justin Findlay
3493cc1fca Merge pull request #23350 from lorengordon/file.replace_assume_line 
Append/prepend: search for full line
 2015-05-05 15:42:11 -06:00
Thomas S Hatch
7be5c48ad5 Merge pull request #23341 from cachedout/issue_23026 
Fix syndic pid and logfile path
 2015-05-05 15:29:10 -06:00
Thomas S Hatch
ea61abfa68 Merge pull request #23272 from basepi/salt-ssh.minion.config.19114 
[2014.7] Allow salt-ssh minion config overrides via master config and roster
 2015-05-05 15:28:47 -06:00
Colton Myers
c223309bb7 Add versionadded 2015-05-05 12:44:50 -06:00
Eric Fode
9efc13c810 more linting fixes 2015-05-05 12:06:17 -06:00
Eric Fode
cf131c9a5a cleaned up some pylint errors 2015-05-05 12:06:17 -06:00
Eric Fode
f981699c75 added logic to sftp_file and file_map to allow folder uploads using file_map 2015-05-05 12:06:16 -06:00
Kaithar
577f41972e Pylint fix 2015-05-05 15:40:30 +01:00
Mike Place
e98e65e787 Fix tests 2015-05-05 08:20:41 -06:00
Mike Place
4f760dd9cb Merge pull request #23347 from basepi/salt-ssh.functionwrapper.contains.19114 
[2014.7] Salt-SSH Backport FunctionWrapper.__contains__
 2015-05-05 08:13:20 -06:00
Kaithar
8d9acd1f89 Put the sed insert statement back in to the output. 
Turns out that commit a369c883 (merged in PR #18368) make a bad change to modules/makeconf.py where it removed the insertion part of a '/regex/ i\text' construction.
 2015-05-05 14:19:56 +01:00
Nicole Thomas
02658b1e60 Merge pull request #23344 from cachedout/issue_22742 
Explicitely set file_client on master
 2015-05-04 17:21:48 -06:00
Colton Myers
30595e3ff7 Backport FunctionWrapper.__contains__ 
Otherwise `if 'config.get' in __salt__` fails becaues it tries to
iterate over a list (starting with 0, 1, 2, etc)
 2015-05-04 16:39:23 -06:00
Colton Myers
be7407feae Lint 2015-05-04 16:18:30 -06:00
Colton Myers
c2c337567e Missing comma 2015-05-04 15:36:33 -06:00
Colton Myers
8e3e8e073a Pass the minion_opts through the FunctionWrapper 2015-05-04 15:33:39 -06:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Thomas S Hatch
ba7605d1cb Merge pull request #23318 from cellscape/honor-seed-argument 
Honor seed argument in LXC container initializaton
 2015-05-04 14:58:12 -06:00