valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,054 Commits 24 Branches 182 Tags 341 MiB
882fcd846f
Commit Graph

83054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
garethgreenaway
882fcd846f Merge pull request #43029 from terminalmage/fix-func-alias 
Normalize the salt caching API
 2017-08-21 09:54:58 -07:00
Nicole Thomas
dbee735f6e Merge pull request #43039 from gtmanfred/kube 
catch ImportError for kubernetes.client import
 2017-08-21 10:32:37 -04:00
Nicole Thomas
c56a8499b3 Merge pull request #43058 from rallytime/fix-release-num 
Update release version number for jenkins.run function
 2017-08-21 10:13:34 -04:00
Nicole Thomas
7b0c94768a Merge pull request #43051 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-18 13:05:57 -04:00
rallytime
153a463b86 Lint: Add missing blank line 2017-08-18 10:59:12 -04:00
rallytime
d7eef70df0 Update release version number for jenkins.run function 
This function was added for the 2017.7.0 release, not Carbon.
 2017-08-18 09:44:22 -04:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
Nicole Thomas
d15b0ca937 Merge pull request #43035 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.1 to 2017.7
 2017-08-18 08:58:16 -04:00
Nicole Thomas
43aa46f512 Merge pull request #43048 from rallytime/bp-43031 
Back-port #43031 to 2016.11
 2017-08-18 08:56:03 -04:00
Daniel Wallace
35e45049e2 use a ruby gem that doesn't have dependencies 2017-08-18 08:55:02 -04:00
garethgreenaway
ad89ff3104 Merge pull request #43023 from terminalmage/fix-jenkins-xml-caching 
Fixes/improvements to Jenkins state/module
 2017-08-17 18:33:10 -07:00
garethgreenaway
2957467ed7 Merge pull request #43026 from rallytime/bp-43020 
Back-port #43020 to 2016.11
 2017-08-17 16:19:46 -07:00
garethgreenaway
bcbb973a71 Merge pull request #43034 from rallytime/bp-43002 
Back-port #43002 to 2017.7
 2017-08-17 16:18:15 -07:00
garethgreenaway
9182f55bbb Merge pull request #42958 from gtmanfred/2017.7 
runit module should also be loaded as runit
 2017-08-17 15:30:22 -07:00
garethgreenaway
5985cc4e8e Merge pull request #43031 from gtmanfred/test_gem 
use a ruby gem that doesn't have dependencies
 2017-08-17 15:26:24 -07:00
garethgreenaway
246176b1a6 Merge pull request #43030 from rallytime/dockermod-minor-change 
Small cleanup to dockermod.save
 2017-08-17 15:25:59 -07:00
garethgreenaway
4150b094fe Merge pull request #43033 from rallytime/bp-42760 
Back-port #42760 to 2016.11
 2017-08-17 15:24:42 -07:00
garethgreenaway
33fd8ff939 Update jenkins.py 2017-08-17 15:22:31 -07:00
Erik Johnson
f8f74a310c Update localfs cache tests to reflect changes to func naming 2017-08-17 17:19:34 -05:00
Mike Place
fc306fc8c3 Add missing colon in if statement 2017-08-17 15:57:42 -06:00
Mike Place
b124d3667e Merge pull request #43032 from rallytime/bp-42547 
Back-port #42547 to 2016.11
 2017-08-17 15:53:50 -06:00
Daniel Wallace
7e269cb368 catch ImportError for kubernetes.client import 2017-08-17 15:46:10 -06:00
rallytime
756128a896 Merge branch '2017.7.1' into '2017.7' 
No conflicts.
 2017-08-17 16:52:06 -04:00
Maximilien Cuony
350c0767dc Try to fix #42989 by doing sslVerify and refspecs for origin remote only if there is no remotes 2017-08-17 16:45:47 -04:00
Aljosha Friemann
3e3f7f5d8e Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files. 2017-08-17 16:38:37 -04:00
Tobias Macey
ea4d7f4176 Updated testinfra modules to work with more recent versions 
The TestInfra library changed the package layout recently which caused
the extension module to stop working. This patch addresses those
updates and will work across all versions of the library.
 2017-08-17 16:36:59 -04:00
rallytime
d6a5e85632 Small cleanup to dockermod.save 
Removes the call to get ``compression`` out of the kwargs dict as
``compression`` is already listed in the list of positional kwargs.
 2017-08-17 16:30:46 -04:00
Erik Johnson
c4ae79b229 Rename other refs to cache.ls with cache.list 2017-08-17 15:06:09 -05:00
Nicole Thomas
a88386ad44 Merge pull request #43027 from pabloh007/fix-docker-save-push-2016-11 
Fixes ignore push flag for docker.push module issue #42992
 2017-08-17 15:55:37 -04:00
Erik Johnson
ee59d127e8 Normalize the salt caching API 
https://github.com/saltstack/salt/pull/40429 changed the attribute used
in `salt/cache/__init__.py` without considering the usage of the cache
system elsewhere in the codebase. This led to a cascade of additional
changes to try to make everything work correctly.

This commit does 2 things:

1) Reverts the calls to the list function to use `list` instead of `ls`
   to conform with the established API used elsewhere in the codebase.

2) Modifies the cache modules so that they now use `list_` functions,
   aliased to `list` so that calls to cache loader instances' `*.list`
   functions elsewhere in the codebase will work.
 2017-08-17 14:50:34 -05:00
Daniel Wallace
ba80a7d4b5 use a ruby gem that doesn't have dependencies 2017-08-17 13:45:10 -06:00
Erik Johnson
822eabcc81 Catch exceptions raised when making changes to jenkins 2017-08-17 13:52:27 -05:00
Nicole Thomas
160001120b Merge pull request #42993 from pabloh007/fix-docker-save-push 
Fixes ignored push flag for docker.push module issue #42992
 2017-08-17 14:50:36 -04:00
garethgreenaway
9009a971b1 Merge pull request #42967 from terminalmage/issue42941 
Fix bug in on_header callback when no Content-Type is found in headers
 2017-08-17 11:48:52 -07:00
garethgreenaway
51d16840bb Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp 
Make chunked mode in salt-cp optional
 2017-08-17 11:37:43 -07:00
Daniel Wallace
0eb15a1f67 test with gem that appears to be abandoned 2017-08-17 14:28:39 -04:00
Pablo Hernandez
d0fd949f85 Fixes ignore push flag for docker.push module issue #42992 2017-08-17 14:24:48 -04:00
Nicole Thomas
58f070d7a7 Merge pull request #43016 from gtmanfred/service 
service should return false on exception
 2017-08-17 14:08:04 -04:00
Nicole Thomas
b3c253cdfa Merge pull request #43009 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-08-17 14:00:08 -04:00
garethgreenaway
37c63e7cf2 Merge pull request #43021 from terminalmage/fix-network-test 
Use socket.AF_INET6 to get the correct value instead of doing an OS check
 2017-08-17 10:57:08 -07:00
garethgreenaway
8f6423247c Merge pull request #43019 from rallytime/bootstrap_2017.08.17 
Update bootstrap script to latest stable: v2017.08.17
 2017-08-17 10:56:40 -07:00
Erik Johnson
4089b7b1bc Use socket.AF_INET6 to get the correct value instead of doing an OS check 
This builds on #43014 with a more future-proof solution.
 2017-08-17 12:12:27 -05:00
garethgreenaway
973d288eca Merge pull request #43020 from gtmanfred/test_gem 
test with gem that appears to be abandoned
 2017-08-17 09:40:40 -07:00
Daniel Wallace
0a1f40a664 test with gem that appears to be abandoned 2017-08-17 10:38:32 -06:00
rallytime
2f762b3a17 Update bootstrap script to latest stable: v2017.08.17 2017-08-17 12:31:25 -04:00
garethgreenaway
ff1caeee68 Merge pull request #43014 from Ch3LL/fix_network_mac 
Change AF_INET6 family for mac in test_host_to_ips
 2017-08-17 09:17:50 -07:00
Mike Place
9cd0607fd4 Merge pull request #42999 from garethgreenaway/slack_engine_allow_editing_messages 
Fixes to slack engine
 2017-08-17 09:46:23 -06:00
Erik Johnson
91b583b493 Improve and correct execption raising 
SaltInvocationError is for invalid arguments, we should be using
CommandExecutionError elsewhere. Also, we don't use backticks as quotes.
Finally, this changes the message in the errors we raise when the
Jenkins bindings raise an exception so that it's a bit more descriptive
than "Something went wrong".
 2017-08-17 10:38:50 -05:00
Erik Johnson
f096917a0e Raise an exception if we fail to cache the config xml 2017-08-17 10:28:35 -05:00
Mike Place
31627a9163 Merge pull request #43010 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-17 09:10:28 -06:00