valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,306 Commits 24 Branches 182 Tags 341 MiB
12a75c1108
Commit Graph

81306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
Nicole Thomas
496fa3accd Merge pull request #41156 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-10 15:29:54 -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
Erik Johnson
77ae15e41b Merge pull request #41155 from rallytime/git-test-fixes 
Gate and skip git state integration tests when git version is older
 2017-05-10 14:53:12 -05:00
rallytime
9014033726 Use LoaderModuleMockMixin for setting up default grains/salt dunders 2017-05-10 13:49:43 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Nicole Thomas
e7b714b6e1 Merge pull request #41171 from terminalmage/remove-git_pillar_warning 
Remove git_pillar warning from integration suite startup
 2017-05-10 11:36:54 -06:00
rallytime
23ee513397 Pylint: Add extra line above function declaration 2017-05-10 11:32:41 -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
rallytime
c282533612 Use with patch.dict for timezone.__grains__ dictionaries 2017-05-10 10:32:24 -06:00
Erik Johnson
03b5420988 Remove git_pillar warning from integration suite startup 
This is no longer needed since the git_pillar configuration has been
removed from the suite's master config file now that git_pillar
integration tests have been added.
 2017-05-10 11:13:43 -05:00
Nicole Thomas
4b67961707 Merge pull request #21 from terminalmage/rallytime-git-test-fixes 
Make git version checks into decorators
 2017-05-10 09:53:47 -06:00
Erik Johnson
018ec5fff9 Make git version checks into decorators 
Also fix a bug in one test where edits to a file are made in the current
working directory and not the git repo being used for the test.
 2017-05-10 10:40:12 -05: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
Erik Johnson
f9aec673d1 Merge pull request #41152 from twangboy/fix_user_add 
Fix user.present for Windows/Mac
 2017-05-10 09:08:43 -05:00
Nicole Thomas
53099b8733 Merge pull request #41110 from twangboy/fix_test_pkg 
Add exeptions to path safety check
 2017-05-09 16:44:39 -06: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
rallytime
3656e9cf31 Remove duplicate function left over from merge forward 
Also adds the distutils import for lint
 2017-05-09 16:40:23 -06:00
rallytime
baa8e3f5a6 Move new timezone_test.py tests over to test_timezone.py tests 2017-05-09 16:33:18 -06:00
twangboy
bc827ad8a7 Fix unit test 2017-05-09 16:00:24 -06:00
twangboy
edb552cd3c Clafify warning message 2017-05-09 15:30:25 -06:00
Ch3LL
28371aa035
2016.11.5 release notes: add additional commits 2017-05-09 17:02:51 -04:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06: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
rallytime
317b5e39bd Add git_opts flag to _check_git_version helper funciton 
We only need to skip the tests with git versions < 1.7.2 when
the test uses the git_opts option.
 2017-05-09 13:52:47 -06:00
rallytime
4019db15fb Skip git state tests when using the "git_opts" option 
And also add some gates for if the git version is too low in general.

This fixes the test failures on CentOS 6 currently in the nitrogen branch.
 2017-05-09 13:46:24 -06:00
Mike Place
d1882e42dd Merge pull request #40870 from twangboy/unicode_console 
[DO NOT MERGE] Add win_unicode_console dependency
 2017-05-09 13:09:20 -06:00
twangboy
d9d3785f26 Fix location of the createhome disablement 2017-05-09 19:03:57 +00:00
twangboy
4143c6ad58 Fix user.present for Windows/Mac 
Disables `createhome` parameter for Windows and Mac as per docs
Removes `_to_unicode` for groups in `user.add` modules, `_to_unicode`
is handled by `user.chgroups` function for groups
 2017-05-09 18:54:23 +00: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
Nicole Thomas
073d3974b6 Merge pull request #41120 from gtmanfred/nitrogen 
document clouds dynamic directory
 2017-05-09 10:01:45 -06:00
Nicole Thomas
f8bfd36519 Merge pull request #41112 from rallytime/suse-pkg-test 
Make sure "version" exists before looking for pkg key
 2017-05-09 10:00:52 -06:00
Nicole Thomas
1a1c80f67c Merge pull request #41109 from rallytime/fix-auth-unit-tests 
Add calls to salt.client.get_local_client to patches list in auth unit tests
 2017-05-09 10:00:08 -06:00
Nicole Thomas
f3694e08da Merge pull request #41106 from rallytime/boto_apigateway_typeerror 
Update str.split call in boto_apigateway module
 2017-05-09 09:59:41 -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