valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,740 Commits 24 Branches 182 Tags 341 MiB
16c3ca6039
Commit Graph

64740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Borgstrom
51bfa16173 Add test to prove that recursive imports are currently broken 
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
 2016-01-20 09:57:16 -08:00
Jacob Hammons
7b9d266096 Fixed another lint error 2016-01-20 10:28:58 -07:00
Jacob Hammons
145ddc05fd Fixed lint errors 2016-01-20 10:04:27 -07:00
Mike Place
2f732b5e8c Merge pull request #30409 from sjorge/state-zfs-snapshots 
salt.states.zfs -> schedule_snapshot
 2016-01-20 09:48:33 -07:00
Mike Place
2b7d20cee7 Merge pull request #30457 from rallytime/fix-22820 
Remove fsutils references from modules list
 2016-01-20 09:43:50 -07:00
Mike Place
28764114d0 Merge pull request #30455 from rallytime/cp-docs 
Versionadded for new cp.push remove_source kwarg
 2016-01-20 09:42:15 -07:00
Mike Place
e706b71871 Merge pull request #30453 from rallytime/fix-30442 
Make sure private AND public IPs are listed for Linode driver
 2016-01-20 09:41:51 -07:00
Mike Place
5c7cc51937 Merge pull request #30459 from jfindlay/pkg_tests 
modules.pkg: disable repo int test for ubuntu 15.10
 2016-01-20 09:41:12 -07:00
Mike Place
73f372dc98 Merge pull request #30458 from rallytime/bp-30062 
Back-port #30062 to 2015.8
 2016-01-20 09:40:22 -07:00
Mike Place
c3fb4006b0 Merge pull request #30468 from timcharper/2015.8 
make note of s3 role assumption in upcoming changelog
 2016-01-20 09:28:04 -07:00
Mike Place
c611541916 Merge pull request #30470 from whiteinge/match_dict 
Add example of the match_dict format to accept_dict wheel function
 2016-01-20 09:26:16 -07:00
Pedro Algarvio
09ab506a4b Don't pass args nor kwargs since that will raise a deprecation warning in Py3 2016-01-20 11:44:16 +00:00
Uwe Stolt
7eba4790e3 smtp_return: an empty optional config value "smtp.renderer" leads to a blank e-mail #30438 
fixed salt/returners/__init__.py b/salt/returners/__init__.py

issue_#30438
 2016-01-20 11:10:03 +01:00
Jacob Hammons
2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
Tim Harper
721c1c871b make note of s3 role assumption in upcoming changelog 2016-01-19 20:38:21 -07:00
Seth House
5034e13f5d Add example of the match_dict format to accept_dict wheel function 2016-01-19 19:18:31 -07:00
Pedro Algarvio
a6b70e191e Patch when creating the new class instance to avoid PyLint complaints 2016-01-20 01:25:46 +00:00
Pedro Algarvio
8587092643 Re-raise the exception to allow proper set of exitcode 2016-01-20 01:24:45 +00:00
Pedro Algarvio
eeb6d26d62 Patch the run method to log uncaught exceptions 2016-01-20 01:24:45 +00:00
Shane Lee
ccc3dffffd Merge pull request #30463 from UtahDave/develop 
Rename dsc.py to match other windows modules
 2016-01-19 17:15:00 -07:00
twangboy
db777e3838 Added mike's suggestions 2016-01-19 17:11:57 -07:00
Zack Hsi
fbff36df36 Fix unit test 2016-01-19 16:06:07 -08:00
David Boucha
3a0bc030ce Rename dsc.py to match other windows modules 2016-01-19 16:38:48 -07:00
Justin Findlay
fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 2016-01-19 15:27:12 -07:00
Sean Jenkins
9665d9655f Set (pillar_)merge_lists to default for PR#30062 2016-01-19 15:06:50 -07:00
Sean Jenkins
7ea4dbf478 Fix lint for PR30062 2016-01-19 15:06:37 -07:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
rallytime
3288ff104d Remove fsutils references from modules list 
Fixes #22820
 2016-01-19 14:41:02 -07:00
rallytime
fd097f018e Versionadded for new cp.push remove_source kwarg 2016-01-19 14:19:41 -07:00
Mike Place
d70e6b312a Merge pull request #30450 from gtmanfred/2015.8 
fix extension loading in novaclient
 2016-01-19 14:16:32 -07:00
Mike Place
0af5e16809 Merge pull request #30212 from abednarik/fix_file_line_permissions 
Fix incorrect file permissions in file.line
 2016-01-19 14:15:48 -07:00
Mike Place
d29a49c985 Merge pull request #30380 from jizhilong/fix/30313 
fix multiprocessing mode on windows.
 2016-01-19 14:10:07 -07:00
Mike Place
6564ec499e Merge pull request #30430 from MadsRC/develop 
Added feature: cp.push delete source file
 2016-01-19 14:07:24 -07:00
jacobhammons
dd4edee95d Merge pull request #30452 from jacobhammons/mock-modules 
added tornado.netutil and tornado.stack_context to doc mock modules
 2016-01-19 14:03:50 -07:00
Jacob Hammons
238ccba640 added tornado.netutil and tornado.stack_context to doc mock modules 2016-01-19 14:03:27 -07:00
rallytime
a1f882f4fe Make sure private AND public IPs are listed for Linode driver 
Fixes #30442

Also simplifies the return of the get_ips function to be used in
other places.
 2016-01-19 14:02:55 -07:00
Mike Place
1695bbe9d7 Merge pull request #30345 from ayackel/artifactory-latest-release 
Add ability to artifactory state to download the latest release of an artifact.
 2016-01-19 13:37:44 -07:00
Mike Place
3c12b451fe Merge pull request #29947 from jfindlay/remote_decode 
fileclient: decode file list from master
 2016-01-19 13:36:32 -07:00
Mike Place
6e8b1e89a5 Merge pull request #30363 from terminalmage/issue30203 
Use native "list" subcommand to list git worktrees
 2016-01-19 13:35:41 -07:00
Jorge Schrauwen
2dfc2c2d61 updated docs to be less confusing 2016-01-19 20:28:42 +00:00
Mike Place
ff58c4a28d Merge pull request #30449 from aboe76/update_suse_doc 
fix minor inconsistencies tampakrap suggested
 2016-01-19 13:23:27 -07:00
Daniel Wallace
4aa6faaf48 fix extension loading in novaclient 
This should fix #28017
 2016-01-19 13:55:39 -06:00
Niels Abspoel
b55625c42a fix minor inconsistencies tampakrap suggested 2016-01-19 20:17:22 +01:00
Mads R. Christensen
bf39127929 Forgot to replace dirs with _ 2016-01-19 19:56:03 +01:00
Mike Place
97ae25e864 Merge pull request #30423 from RuriRyan/fix_x509_csr_signing 
Fixed the signing of csrs and applying of their subject
 2016-01-19 11:53:37 -07:00
Mike Place
30646f852f Merge pull request #30410 from aboe76/suse_repo_documentation 
update suse information regarding to repositories fixes #29194
 2016-01-19 11:51:01 -07:00
Mike Place
b4c8287d13 Merge pull request #30382 from ossobv/ossobv-fix-dropfile-for-nonprivileged-user 
Fix dropfile support for non-privileged salt-master user.
 2016-01-19 11:37:18 -07:00
Mike Place
dfb9dec84f Merge pull request #30445 from jtand/boto_vpc_8 
Boto uses False for is_default instead of None
 2016-01-19 11:28:18 -07:00
Mike Place
dd2ceb4c07 Merge pull request #30443 from jtand/boto_vpc_5 
Boto uses False for is_default instead of None
 2016-01-19 11:28:08 -07:00
Mike Place
f9b3f3f038 Merge pull request #30406 from ZipRecruiter/check-cmd-example 
Add an example of how to use file.managed/check_cmd
 2016-01-19 11:23:49 -07:00