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
77,089 Commits 24 Branches 182 Tags 341 MiB
229f3bf9f3
Commit Graph

77089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jmarinaro
229f3bf9f3 apply changes to uninstalled function 
Fixes #41185
 2017-05-11 11:25:46 -06:00
jmarinaro
ffd4c7ef04 Fix package name collisions in chocolatey state 
Fixes #41185
 2017-05-10 19:44:24 -06:00
Nicole Thomas
b136b15330 Merge pull request #41104 from Ch3LL/add_jobs_test 
Add test to query results of /jobs call in api
 2017-05-10 14:11:07 -06:00
Nicole Thomas
ca18b4df93 Merge pull request #41170 from lomeroe/bp-41081 
Backport #41081 to 2016.11
 2017-05-10 13:58:52 -06:00
Nicole Thomas
d7ec37b003 Merge pull request #41173 from twangboy/fix_installer 
Add silent action to MsgBox for Path Actions
 2017-05-10 13:57:05 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
twangboy
96918dcfa6 Add silent action to MsgBox for Path Actions 2017-05-10 11:22:18 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api 2017-05-10 12:39:17 -04:00
lomeroe
2af89f2165 update mock data 2017-05-10 10:33:34 -05:00
lomeroe
b7fa115a59 update win_dns_client tests with correct module names 2017-05-10 10:33:33 -05:00
lomeroe
4d05a22675 Update win_dns_client to use reg.read_value and set_value 2017-05-10 10:33:31 -05:00
Nicole Thomas
88e93b7fe5 Merge pull request #41158 from Ch3LL/update_2016.11.5 
2016.11.5 release notes: add additional commits
 2017-05-09 16:41:39 -06:00
Ch3LL
28371aa035
2016.11.5 release notes: add additional commits 2017-05-09 17:02:51 -04:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-09 14:23:28 -06:00
Mike Place
2156395b2e Merge pull request #41147 from rallytime/bp-39676 
Back-port #39676 to 2016.11
 2017-05-09 12:40:43 -06:00
Mike Place
a2f359fa13 Merge pull request #40852 from isbm/isbm-fix-coregrains-constants-bsc#1032931 
Isbm fix coregrains constants bsc#1032931
 2017-05-09 12:35:45 -06:00
Mike Place
6fa41dc89d Merge pull request #41111 from terminalmage/issue41105 
Allow "ssl_verify: False" to work with pygit2
 2017-05-09 11:56:11 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-09 11:14:05 -06:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
Mike Place
2969153097 Merge pull request #41122 from terminalmage/masterless-env_cache-fix 
gitfs: refresh env cache during update in masterless
 2017-05-09 11:06:55 -06:00
Nicole Thomas
81add1b944 Merge pull request #41008 from cro/rsax_smos 
Look in /opt/*/lib instead of just /opt/local/lib on Illumos distros.
 2017-05-09 10:56:00 -06:00
Mike Place
b8f0a4f108 Merge pull request #41123 from terminalmage/gitfs-vsts-note 
Add note on lack of support for VSTS in older libssh2 releases.
 2017-05-09 10:49:47 -06:00
Mike Place
c649725e9b Merge pull request #41124 from gtmanfred/do 
add user_data to digitalocean
 2017-05-09 10:47:41 -06:00
Mike Place
d0a3fcf33a Merge pull request #41127 from xetus-oss/fix-41125-service-running 
Fix incorrect service.running state response when enable=None and init script returns 0
 2017-05-09 10:43:34 -06:00
Erik Johnson
be732f0577 gitfs: refresh env cache during update in masterless 
This fixes an edge case where an env blacklist/whitelist was updated
between masterless runs, or in later releases if an environment was
added via per-saltenv configuration. In these cases, if there are no
changes fetched, the env cache will remain intact, and will be returned
when envs() is called. This commit forces the env cache to be refreshed
on every update in masterless mode.

It also forces the env cache to be ignored when
salt.fileserver.Fileserver.envs() is executed in masterless mode (such
as via the fileserver.envs runner).
 2017-05-09 10:12:45 -05:00
Mike Place
a10f0146a4 Merge pull request #41134 from twangboy/fix_get_msiexec 
Fix `pkg.install` on Windows on 2016.11
 2017-05-09 09:10:18 -06:00
Bo Maryniuk
f3b12a3f5b Do not use multiple variables in "with" statement as of lint issues 2017-05-09 10:17:49 +02:00
twangboy
d808a60129 Remove redundant if statement 2017-05-08 16:02:04 -06:00
twangboy
b4d6d5a927 Fix for version_num of None and Latest 2017-05-08 15:59:36 -06:00
twangboy
0f31822a83 Fix problem when use_msiexec is a bool 2017-05-08 14:01:01 -06:00
Mike Place
4ecab68bb9 Merge pull request #41102 from gtmanfred/2016.11 
don't pass jid to list_jobs
 2017-05-08 11:45:39 -06:00
Daniel Wallace
2370d9316b add user_data to digital ocean 2017-05-08 09:59:27 -06:00
Theophile Meneau
d8766562c9 fix incorrect service.running success response 
when enable=None and init script returns 0,
but service failed to start.

Fixes #41125
 2017-05-08 10:25:21 -04:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Bo Maryniuk
35a8d99934 Disable the test for a while 2017-05-08 13:49:54 +02:00
Bo Maryniuk
76cb1b7150 Rewrite test case for using no patch decorators 2017-05-08 10:41:50 +02:00
Erik Johnson
ffe4bc3d5c update unit test to reflect new behavior 2017-05-06 01:29:49 -05:00
Erik Johnson
482a5e341d Merge branch 'L4rS6-fix-file-blockreplace-diff-in-test-mode' into 2016.11 2017-05-06 01:29:46 -05:00
Erik Johnson
505cb45722 Merge branch 'fix-file-blockreplace-diff-in-test-mode' of https://github.com/L4rS6/salt into L4rS6-fix-file-blockreplace-diff-in-test-mode 2017-05-06 01:29:18 -05:00
Erik Johnson
2af89beb53 Merge pull request #41103 from lorengordon/win.get_route 
Adds a get_route() function to win_network.py
 2017-05-06 01:19:41 -05:00
Erik Johnson
8f79b6f537 Merge pull request #41090 from bbinet/rdurations_float 
rdurations should be floats so that they can be summed when profiling
 2017-05-06 01:18:40 -05:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
98ce829729 Support ssl_verify in pygit2 2017-05-05 16:58:13 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
Loren Gordon
93ce5644ea Adds test for win_network.get_route 2017-05-05 17:32:50 -04:00
Daniel Wallace
83057d0f0f don't pass jid to list_jobs 2017-05-05 14:32:08 -06:00
Loren Gordon
b9cbbc0290 Adds a get_route() function to win_network.py 
Returns the same data as the get_route() function in the network.py
execution module.
 2017-05-05 16:19:11 -04:00
Nicole Thomas
2f9b5a4074 Merge pull request #41098 from rallytime/bp-41088 
Back-port #41088 to 2016.11
 2017-05-05 13:04:02 -06:00
Nicole Thomas
2123001f32 Merge pull request #41097 from rallytime/bp-41079 
Back-port #41079 to 2016.11
 2017-05-05 13:03:42 -06:00
Nicole Thomas
ff6fa2b120 Merge pull request #41093 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-05 11:22:08 -06:00