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
86,597 Commits 24 Branches 182 Tags 341 MiB
ea6d5259b3
Commit Graph

86597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e3a2fbc2a3 Merge pull request #43676 from terminalmage/runners-docs-2017.7 
Fix RST headers for runners (2017.7 branch)
 2017-09-21 10:36:20 -06:00
Mike Place
365cb9fba8 Merge pull request #43677 from terminalmage/runners-docs-2016.11 
Fix RST headers for runners (2016.11 branch)
 2017-09-21 10:35:56 -06:00
Mike Place
d6057a8007 Merge pull request #43678 from rallytime/add-purefa-autodocs 
Add autodoc file for new purefa execution module
 2017-09-21 10:35:20 -06:00
Alexandru Bleotu
f46afa0fa9 Removed references to Pthon 2.6 as it's no longer supported in Salt 2017-09-21 12:31:40 -04:00
Alexandru Bleotu
2f55841037 Added python/pyvmomi compatibility check to salt.modules.vsphere 2017-09-21 12:31:38 -04:00
Alexandru Bleotu
5f30477a6a Added python/pyvmomi compatibility check to salt.states.esxcluster 2017-09-21 12:31:36 -04:00
vernoncole
292f8c79b8 correct default value for salt.cache.Cache 2017-09-21 10:26:00 -06:00
Erik Johnson
9b74634b23 Fix badly-formatted RST in mattermost runner docstring 2017-09-21 10:54:27 -05:00
rallytime
bd88c375d8
Add autodoc file for new purefa execution module 2017-09-21 11:51:15 -04:00
Vladimir Nadvornik
1c006db2a6 Fix and extend mdadm unit tests 2017-09-21 17:46:15 +02:00
Vladimir Nadvornik
6fcb7e7739 Minor bugfixes 
- do not try to add devices if assemble failed
- sort uuid list in error message
 2017-09-21 17:43:05 +02:00
Erik Johnson
c0a79c70a4 Fix RST headers for runners (2017.7 branch) 
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
 2017-09-21 10:27:12 -05:00
Erik Johnson
2fd88e94fa Fix RST headers for runners (2016.11 branch) 
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
 2017-09-21 10:11:28 -05:00
Nicole Thomas
be38239e5d Merge pull request #43534 from twangboy/win_fix_pkg.install_2016.11 
Fixes removal of double-quotes by shlex_split in winrepo for 2016.11
 2017-09-21 10:39:41 -04:00
Raymond Piller
d91c47c6f0 Salt Repo has Deb 9 and 8 2017-09-21 10:24:41 -04:00
matt
3fb42bc238 Fix env_order in state.py 
Fixes #42165
 2017-09-21 10:22:54 -04:00
rallytime
a401166bd5 Merge branch '2017.7.2' into '2017.7' 
No conflicts.
 2017-09-21 09:52:38 -04:00
Dmitry Kuzmenko
039d236948 Fixed list and contains redis cache logic. 
Wrong keys was used to retrieve the data.
 2017-09-21 16:44:53 +03:00
Nicole Thomas
f66eb1c5ad Merge pull request #43588 from gtmanfred/do 
digitalocean should be one word.
 2017-09-21 09:25:38 -04:00
Nicole Thomas
f4eac59d96 Merge pull request #43652 from VertigoRay/patch-1 
Salt Repo has Deb 9 and 8
 2017-09-21 09:19:27 -04:00
Nicole Thomas
0d3fd3d374 Merge pull request #43661 from moio/2016.11-multiprocessing-doc-fix 
multiprocessing minion option: documentation fixes (2016.11)
 2017-09-21 09:02:26 -04:00
Nicole Thomas
9eab1ea94c Merge pull request #43663 from moio/develop-multiprocessing-doc-fix 
multiprocessing minion option: documentation fixes (develop)
 2017-09-21 09:01:30 -04:00
Joaquin Veira
fda66f3e92 corrected identation 2017-09-21 13:38:27 +02:00
Alexandru Bleotu
cbefa4d3fd Fixed except statement 2017-09-21 06:42:52 -04:00
Silvio Moioli
4a35fe5019 multiprocessing minion option: documentation fixes 2017-09-21 11:30:21 +02:00
Alexandru Bleotu
ee0dcd7b67 More pylint 2017-09-21 05:01:19 -04:00
Silvio Moioli
625eabb83f multiprocessing minion option: documentation fixes 2017-09-21 10:55:52 +02:00
Alexandru Bleotu
1706c24add Imported salt.exceptions in salt.states.esxcluster 2017-09-21 04:14:59 -04:00
Erik Johnson
5d45329111 salt.utils.gitfs: Enforce fetch URL along with refspecs and http.sslVerify 
This fixes a corner case in which someone is using the `name` config
param for a given gitfs/git_pillar remote, and then changes the URL for
that remote (for instance, between https and ssh). We've simply never
enforced the fetch URL in the git config for a given remote's cachedir,
since the cachedir is typically determined by hashing the URL (or branch
+ URL for git_pillar). In those cases, changing the URL changes the
cachedir path, and results in a new repo being init'ed and the correct
URL being added to the git config as part of the initialization. But,
when using the `name` param, the path to the cachedir would remain
constant no matter what the URL is. This means that when the URL is
changed in the gitfs/git_pillar config, it isn't actually updated in the
git config file for that cachedir.

With this change, the new GitConfigParser is used to examine the fetch
URL and update it if necessary.
 2017-09-21 00:05:10 -05:00
Raymond Piller
5f47ef721c Salt Repo has Deb 9 and 8 2017-09-20 21:41:08 -05:00
Tom Williams
d2106f79bb INFRA-5461 - Use the same var name in both places, Tom :) 2017-09-20 21:47:06 -04:00
Tom Williams
45096a5d56 INFRA-5461 - sanity check return 2017-09-20 21:46:49 -04:00
Tom Williams
69049c1da6 INFRA-5461 - more boto_elb AWS rate limiting fixes 2017-09-20 21:46:34 -04:00
Daniel Wallace
2f3be5785b
there were more 2017-09-20 15:55:37 -06:00
Nicole Thomas
d02953ce6a Merge pull request #43235 from brejoc/improve-async-operation-handling-in-kubernetes-module 
Improve delete_deployment handling
 2017-09-20 17:33:32 -04:00
Alexandru Bleotu
491faaa2ab Review changes 2017-09-20 17:20:39 -04:00
Nicole Thomas
4fa0b3d038 Merge branch 'develop' into fix-boto3-util-pack-error 2017-09-20 17:15:41 -04:00
Alexandru Bleotu
23f58c0ff3 Even more pylint 2017-09-20 17:07:17 -04:00
Alexandru Bleotu
819e015d33 Added InvalidEntityError in salt.exceptions 2017-09-20 17:02:17 -04:00
rallytime
54842b5012 Handle VPC/Subnet ID not found errors in boto_vpc module 
If a VPC or Subnet ID is not found when calling functions that are
supposed to be checking for vpc/subnet ID existence, the return
should be consistent by returning booleans/None instead of returning
the NotFound error from AWS.

The surrounding code blocks indicate that this is expected as well
as unit test assertions. The moto library had a bug in it where
it wasn't raising "x.NotFound" errors when it should have been. The
latest version of moto has fixed this bug, causing our tests to fail
since the boto_vpc module is not handling the "x.NotFound" errors
separately from the generic BotoServerErrors.

This fixes the test failures in the branch tests that were caused by
upgrading the moto version to the latest release.
 2017-09-20 16:58:17 -04:00
Mike Place
6b4516c025 Merge pull request #43646 from brejoc/2016.11.4-pidfile-tests 
Added tests for pid-file deletion in DaemonMixIn
 2017-09-20 13:21:53 -06:00
Alexandru Bleotu
aa26f0bb83 Fixed list_differ because of ignore_unset_values change in dictdiffer 2017-09-20 13:54:58 -04:00
Alexandru Bleotu
a41b5072da more pylint 2017-09-20 13:40:36 -04:00
Mike Place
8cf0588221 Merge pull request #43552 from morganwillcock/comspec 
Shell grain: check %COMSPEC% for the shell for Windows
 2017-09-20 10:07:09 -06:00
Mike Place
73cb0c27b5 Merge pull request #43554 from twangboy/win_fix_chocolatey 
Win fix chocolatey
 2017-09-20 10:06:17 -06:00
Mike Place
635da91135 Merge pull request #43564 from epcim/fix-nacl-decrypt 
Fix names of NACL dec. methods
 2017-09-20 10:02:40 -06:00
Daniel Wallace
f54ddae6bb
fix do test where space was seperated by a newline 2017-09-20 09:57:57 -06:00
Mike Place
58278a10d3 Merge pull request #43603 from Juniper/develop 
keep alive feature for junos and schedular support for rpc call
 2017-09-20 09:47:35 -06:00
Mike Place
ed7eeaaafb Merge pull request #43625 from gtmanfred/2017.7 
results and columns are lists for mysql returns
 2017-09-20 09:42:59 -06:00
Jochen Breuer
96f39a420b Fixed linting 
Fix for "String format call with un-indexed curly braces".
 2017-09-20 16:35:01 +02:00