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,938 Commits 24 Branches 182 Tags 341 MiB
5be5eb5b14
Commit Graph

38938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shouguan Lin
5be5eb5b14 Fixed pylink errors 2015-05-07 13:37:08 -07:00
Shouguan Lin
e64f374ffa Fixed lint errors 2015-05-07 12:29:50 -07: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
Thomas S Hatch
4ac4509c57 Merge pull request #23307 from jfindlay/fix_locale_gen 
check for /etc/locale.gen
 2015-05-04 14:56:32 -06:00
Colton Myers
c273ea14c6 Add minion config to salt-ssh doc 2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3 Add minion_opts to roster docs 2015-05-04 14:46:16 -06:00
Colton Myers
5212c35260 Accept minion_opts from the target information 
Rosters can now define minion_opts under the host info
 2015-05-04 14:37:31 -06:00
Mike Place
5adc96ce7f Explicitely set file_client on master 
Failure to do so will break mine calls from the pillar. Closes #22742
 2015-05-04 14:27:41 -06:00
Mike Place
6011b437ca Fix syndic pid and logfile path 
Closes #23026
 2015-05-04 13:06:19 -06:00
Nicole Thomas
f790f42ed6 Merge pull request #23324 from s0undt3ch/hotfix/bootstrap-script-2014.7 
[2014.7] Update to the latest stable release of the bootstrap script v2015.05.04
 2015-05-04 10:28:30 -06:00
Nicole Thomas
5487367baa Merge pull request #23329 from cro/cloud_verify_cert 
Require requests to verify cert when talking to aliyun and proxmox cloud providers
 2015-05-04 10:18:17 -06:00
C. R. Oldham
860d4b7338 Turn on ssl verify for requests. 2015-05-04 08:40:14 -06:00
lorengordon
b60e224beb Append/prepend: search for full line 
When `append_if_not_found` or `prepend_if_not_found`
are true, assume the `content` to search for should
match a full line in the file. The rationale is that
if the content is not found, then it will be added as
a full line. Hence, it should be safe to assume that
it should exist as a full line in the file.

Fixes #23294
 2015-05-04 09:41:11 -04:00
Pedro Algarvio
6643e47ce5 Update to the latest stable release of the bootstrap script v2015.05.04 
* Fix the configuration path for FreeBSD. #567/#552. Thanks Ronald van Zantvoort(The-Loeki).
* Fix non grouping support in POSIX sed. Thanks Ronald van Zantvoort(The-Loeki).
* Add Debian 8 support. Thanks Matt Black(mafrosis)
* Improve Debian version parsing. Thanks Mark Lee(malept)
* Make sure we update packages list one Chris Lea's PPA repository is added.
* Hard code the Debian Squeeze backports to the DE mirror since the main repository is down. Thanks @panticz. saltstack/salt-bootstrap#589.
* Only install git if not already installed. saltstack/salt-bootstrap#560
* Fix openSUSE 13.2 where we need to pass --replaceflags. Thanks Roman Inflianskas(rominf). saltstack/salt-bootstrap#504.
* Make sure that a recent enough requests package is installed in Debian/Ubuntu.
* Install tornado on git installs for the develop branch if necessary. saltstack/salt-bootstrap#580
* Add support for Ubuntu 15.04
 2015-05-04 13:23:54 +01:00
cellscape
228b1be299 Honor seed argument in LXC container initializaton 
Fixed #23311
 2015-05-04 16:38:08 +06:00