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
82,000 Commits 24 Branches 182 Tags 341 MiB
dcadf12d4d
Commit Graph

82000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
bde4d7bbd9 Bugfix: datetime should be returned always in UTC 2017-05-10 15:26:38 +02:00
miromode
7395d27679 ret_config and ret_kwargs in orchestration 2017-05-09 18:16:05 -07:00
coutotyler
7f512c701b Pass hosts and profile to index_exists() method 2017-05-09 18:11:12 -07: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
Ronald van Zantvoort
24946fef18 gpg renderer: fix gpg_keydir always reverting to default 2017-05-10 00:42:52 +02: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
Nicole Thomas
3e91fc1896 Merge pull request #41150 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-09 14:05:29 -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
a6eb11aebb Merge pull request #41145 from kennyballou/slack_notify_update_doc 
slack_notify: use correct function name in docstring
 2017-05-09 13:18:53 -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
bef2252720 Merge pull request #41136 from lorengordon/shadow.list_users 
Adds a function to list all users from shadow file
 2017-05-09 12:38:25 -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
twangboy
53458b88e9 Fix python 2.7.13 install, fix clean script 2017-05-09 18:32:03 +00:00
Mike Place
8099c9f27f Merge pull request #41081 from lomeroe/fix-win_dns_client-reg_read 
Update win_dns_client to use reg.read_value and set_value
 2017-05-09 12:13:51 -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
4c099df8fa Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-09 11:27:55 -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
Erik Johnson
f9d6734afe gitfs: Backport performance fixes for getting tree objects 
Also fix the envs() func when a saltenv is mapped to a sha instead of a
branch or tag.
 2017-05-09 12:02:26 -05:00
Loren Gordon
06c46b48f3 Adds a function to list all users from shadow file 2017-05-09 12:58:12 -04: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
Nicole Thomas
150d29d74b Merge pull request #41108 from SaltyCharles/patch-6 
update aws.rst for usage clarification
 2017-05-09 10:44:06 -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
kballou
d301a22e0d
slack_notify: use correct function name in docstring 
The docstring of `slack_notify.call_hook` uses a different, undefined
function for the example.
 2017-05-09 10:04:43 -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
Mike Place
98a041f89d Merge pull request #41138 from gtt116/develop 
Fix redis returner using too many connections
 2017-05-09 09:43:02 -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
gtt116
c7c5016a4c Fix redis returner using too many connections 
Currently, when using redis returner (by set `master_job_cache: redis`
in salt master configuration). Each execution will create a new
connection to redis, which may use up the connection pool of redis sooner or
latter, especially in large scale deployment. We found many exception in log:

```
ConnectionError: Error 99 connecting localhost:6379. Cannot assign requested
address.
```

This patch fix this by using redis connection pool.
 2017-05-09 11:01:44 +08:00
Erik Johnson
67363f6e32 Update fileserver unit tests 
This fixes the tests by adding back gitfs_env_blacklist, and also
converts the config tests to use the new LoaderModuleMixin.
 2017-05-08 20:30:46 -05: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