valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,814 Commits 24 Branches 182 Tags 341 MiB
8930617331
Commit Graph

94814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
8930617331
Merge pull request #47793 from slivik/ini_manage-dry-run 
Fixes dry run in ini_manage + Fixes related bug - when working with o…
 2018-06-08 09:45:41 -04:00
slivik
d837cba3a3 Merge branch 'ini_manage-dry-run' of https://github.com/slivik/salt into ini_manage-dry-run 2018-06-08 10:45:42 +02:00
slivik
5fadacc362
pylint cosmetics. 2018-06-08 10:44:54 +02:00
Nicole Thomas
c23ea22f6d
Merge pull request #48011 from terminalmage/docs-develop 
Clean up Sphinx build errors in develop branch
 2018-06-07 10:42:13 -04:00
Nicole Thomas
5b4e7953e8
Merge pull request #47951 from rares-pop/dev/iepopr/fix_nilinuxrt_core_grains 
Fix NI Linux RT distribution core grains
 2018-06-07 10:36:09 -04:00
Erik Johnson
04a80673a2
Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
Nicole Thomas
713ae1dca7
Merge pull request #48005 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-06 17:22:45 -04:00
Nicole Thomas
3de777393d
Merge pull request #47950 from gmsoft-tuxicoman/fstab-fix 
Fix parsing fstab when dump and pass aren't present
 2018-06-06 17:21:59 -04:00
Nicole Thomas
2f8ea4a59d
Merge pull request #48004 from terminalmage/salt-jenkins-1008 
Update tests to reflect changes in #47580
 2018-06-06 15:02:45 -04:00
Nicole Thomas
9f1b932c21
Merge branch 'develop' into ini_manage-dry-run 2018-06-06 13:56:24 -04:00
Nicole Thomas
aa9b45d0be
Merge pull request #47677 from moench-tegeder/alternatives_install 
fix states.alternatives.install to really install alternative
 2018-06-06 13:55:56 -04:00
Guy Martin
9d056ace8d Remove extra space. 2018-06-06 19:51:08 +02:00
rallytime
bf08bcf5f9
Update old invalid_kwargs path to use new utils path 2018-06-06 13:38:06 -04:00
rallytime
7dc1e770c4
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/topics/installation/freebsd.rst
  - salt/cloud/clouds/oneandone.py
  - salt/grains/core.py
  - salt/modules/napalm_ntp.py
  - salt/modules/win_update.py
  - salt/modules/win_wua.py
  - salt/modules/zabbix.py
  - salt/renderers/pass.py
  - salt/states/vault.py
  - tests/unit/states/test_win_update.py
 2018-06-06 13:35:36 -04:00
Nicole Thomas
f12a52736e
Merge pull request #47990 from terminalmage/2018.3-docs 
Docs fixes in 2018.3 release branch
 2018-06-06 13:15:16 -04:00
Erik Johnson
e5a2f53a0d
Update tests to reflect changes in #47580 2018-06-06 11:19:08 -05:00
Nicole Thomas
56e0ed7996
Merge pull request #47977 from terminalmage/get_config_dir 
Use @property instead of @staticmethod for config_dir
 2018-06-06 11:32:33 -04:00
Nicole Thomas
da66e1af7c
Merge pull request #47964 from nocturo/fix47921 
Fix 47921
 2018-06-06 11:27:00 -04:00
Nicole Thomas
9d56af3cad
Merge pull request #47982 from twangboy/fix_test_win_dns_client 
Fix `unit.modules.test_win_dns_client` tests
 2018-06-06 11:02:10 -04:00
Nicole Thomas
d5954e0703
Merge pull request #47716 from gtmanfred/docker 
add docker proxy minion
 2018-06-06 11:00:24 -04:00
Nicole Thomas
1b4c72345b
Merge pull request #47985 from twangboy/fix_test_reg 
Fix `unit.states.test_reg` test failure
 2018-06-06 10:56:02 -04:00
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings 2018-06-06 08:42:21 -05:00
Erik Johnson
f5fc936865
Add clarifying comment so that we don't break this 2018-06-05 19:20:51 -05:00
Erik Johnson
94849780ac
fix docs build error due to IndexError 
The `zmq` module is mocked in Sphinx, so ZMQ_VERSION_INFO ends up being
an empty tuple. Since `zmq.eventloop` and `tornado` are both mocked,
changing this from an index to a tuple comparison will prevent the
IndexError and the code within the if block will be a no-op.
 2018-06-05 19:12:21 -05:00
twangboy
4ce551811f
Remove the unnecessary to_unicode stuff 2018-06-05 17:49:22 -06:00
Nick Zeljkovic
9859b0a43c
Add debug output 2018-06-05 23:49:35 +02:00
twangboy
863ded39fa
Mock reg.cast_vdata 2018-06-05 15:38:28 -06:00
twangboy
2dcdf6788c
Force string to ModuleType 2018-06-05 15:27:12 -06:00
Erik Johnson
a1ce0631fd
Use @property instead of @staticmethod for config_dir 
We're not passing arguments and we're just getting back a string
contstant, so there's no need to make this a staticmethod.
 2018-06-05 14:10:33 -05:00
Daniel Wallace
e58f6bf4a4
use same python version in docker container 2018-06-05 10:57:09 -05:00
Nicole Thomas
84100570f7
Merge pull request #47957 from garethgreenaway/47236_ensure_passphrase_is_a_string 
[2018.8] Ensure x509 passphrase is a string
 2018-06-05 09:27:33 -04:00
Rares POP
e813f3a435 Fix NI Linux RT distribution core grains 
NI fixed lsb_distrib_id to correctly differentiate
between older distribution vs current distribution
which have different behavior for multiple module
functionality, but it should continue to populate
'osfullname' as 'NILinuxRT' not to break existing code

Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-05 16:02:11 +03:00
Nick Zeljkovic
68e56c1502
Fix 47921 2018-06-05 14:45:41 +02:00
slivik
c13e79d8b6
Fixed pylint useless-super-delegation warning. 2018-06-05 11:17:06 +02:00
Gareth J. Greenaway
99bad3cca6
removing unnecessary change 2018-06-04 16:04:45 -07:00
Gareth J. Greenaway
e22df8473d
Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback. 2018-06-04 16:00:54 -07:00
Christoph Moench-Tegeder
c246aac3a6 fix tests for state.alternatives after bugfix 
add another test for case "new alternative registered but not
set as default"
 2018-06-04 22:54:48 +02:00
Christoph Moench-Tegeder
01d34e5ac1 fix whitespace 2018-06-04 22:54:09 +02:00
Nicole Thomas
c355da9e0d
Merge pull request #47926 from dmurphy18/backport_pr47808 
Backport of PR 47808 to 2018.3, improved grains support for AIX
 2018-06-04 15:31:23 -04:00
Mike Place
7de5dbc755
Merge pull request #47928 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 10
 2018-06-04 13:17:45 -06:00
Daniel Wallace
b12f80712b
add more documentation for new function 2018-06-04 14:01:33 -05:00
Daniel Wallace
ce2dae8892
fix calling missing functions in the docker container 2018-06-04 14:01:33 -05:00
Daniel Wallace
f3cb8b73d7
fix tests 2018-06-04 14:01:33 -05:00
Daniel Wallace
b11920de68
add docker highstate test 2018-06-04 14:01:33 -05:00
Daniel Wallace
272cb58899
add to release notes 2018-06-04 14:01:32 -05:00
Daniel Wallace
8a341cdbb9
add docker proxy minion 2018-06-04 14:01:31 -05:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-04 14:55:11 -04:00
Nicole Thomas
d49c2dc83c
Merge pull request #47953 from terminalmage/optimize-git.remote_refs 
Add option to filter git.remote_refs output
 2018-06-04 14:51:57 -04:00
rallytime
5baab66f4b
Lint: Whitespace fix 2018-06-04 12:11:24 -04:00
Erik Johnson
bbcdcb719e
Add option to filter git.remote_refs output 
This can speed up how long it takes to run git ls-remote on repos with a
lot of refs.
 2018-06-04 10:00:03 -05:00