valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,694 Commits 24 Branches 182 Tags 341 MiB
82e17e5fc8
Commit Graph

91694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
4609a7dd85
Merge pull request #46690 from dincamihai/2018.3 
Fix unicode handling in pkg.info_installed
 2018-03-29 10:10:47 -04:00
Nageswar
bf5034dbdb
Merge branch '2017.7' into bugfix-grain-virtual_subtype 2018-03-29 16:00:31 +05:30
Daniel A. Wozniak
5c22a0f88d
Use aboslute imports 2018-03-28 22:32:30 -07:00
Daniel A. Wozniak
44db77ae79
Fix lint errors and typo 2018-03-28 21:06:34 -07:00
Daniel A. Wozniak
5aabd442f2
Fix up import and docstring syntax 2018-03-28 20:54:35 -07:00
Daniel A. Wozniak
810042710d
Set default cloud test timeout back to 500 seconds 2018-03-28 20:39:03 -07:00
Daniel A. Wozniak
5ac89ad307
Use winrm_verify_ssl option causing tests to pass 2018-03-28 20:21:40 -07:00
twangboy
b383b9b330
Change the order of SID Lookup 
Check for a PySID object first (least expensive)
Get PySID object from String SID next
Get PySID object from principal name last (most expensive)
 2018-03-28 17:43:36 -06:00
Daniel Wallace
71858a709c
allow not verifying ssl winrm saltcloud 
Required for Self Signed Certs on pywinrm>=0.2.1
 2018-03-28 15:56:35 -07:00
Daniel A. Wozniak
ba5f11476c
Adding windows minion tests for salt cloud 2018-03-28 15:16:54 -07:00
Nicole Thomas
e5b3c8fa91
Merge pull request #46746 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-28 17:13:06 -04:00
Nicole Thomas
6e9f504ed1
Merge pull request #46751 from folti/2017.7 
top file merging strategy 'same' works again
 2018-03-28 17:12:26 -04:00
Nicole Thomas
ef68df7f3a
Merge pull request #46744 from garethgreenaway/46668_jinja2_filter_strftime_unavailable 
[2018.3] Ensure salt.utils.dateutils is available for templates via salt-ssh
 2018-03-28 17:09:45 -04:00
Nicole Thomas
e745639763
Merge pull request #46767 from twangboy/mac_fix_stacktrace 
Change pyzmq dep the the non-beta version
 2018-03-28 15:22:38 -04:00
Nageswar
8d12770951
Merge branch '2017.7' into bugfix-grain-virtual_subtype 2018-03-29 00:31:10 +05:30
Erik Johnson
70cfafe299
Add test case 2018-03-28 13:48:44 -05:00
twangboy
5eed1682cb
Use 17.0.0 instead of the beta (17.0.0b3) 2018-03-28 12:40:37 -06:00
twangboy
5afc66452c
Remove unused/redundant imports 2018-03-28 12:30:26 -06:00
Erik Johnson
250039b11f
Restore original variable name 2018-03-28 13:29:33 -05:00
twangboy
1403e29d97
Rollback pyzmq to version 16.0.3 2018-03-28 12:24:08 -06:00
Nicole Thomas
d3623e0815
Merge pull request #46691 from Ch3LL/win_group_test 
Add groupadd module integration tests for Windows
 2018-03-28 14:01:45 -04:00
Nicole Thomas
14ab50d3f4
Merge pull request #46696 from dwoz/win_test_client 
Windows `unit.test_client` fixes
 2018-03-28 13:55:46 -04:00
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3' 2018-03-28 13:52:28 -04:00
twangboy
88fd72c52c
Use with_tempfile decorator where possible 2018-03-28 11:38:32 -06:00
Nageswar
710f74c4a6
fix grains['virtual_subtype'] to show Docker on xen kernels 
Fixes #46754 & #43405
 2018-03-28 14:31:53 +00:00
Nicole Thomas
1222bdbc00
Merge pull request #46732 from rallytime/bp-46032 
Back-port #46032 to 2017.7
 2018-03-28 09:43:16 -04:00
Nicole Thomas
50fe1e9480
Merge pull request #46749 from vutny/doc-deprecate-copr 
[DOC] Remove mentions of COPR repo from RHEL installation page
 2018-03-28 09:20:49 -04:00
Tamas Pal
7058f10381 same top merging strategy works again 
get_tops don't set the opts['environment'] from
opts['default_top'] if it's empty and
top_file_merging_strategy is set to 'same'. In effect
get_tops behaves as the merging strategy is the default
'merge'.
 2018-03-28 12:37:10 +02:00
Denys Havrysh
a1cc55da3d
[DOC] Remove mentions of COPR repo from RHEL installation page 
Fixes #28142
 2018-03-28 12:30:07 +03:00
Nicole Thomas
65bb37effd
Merge pull request #46720 from rallytime/bump-nacl-deprecation 
Bump deprecation notices in nacl module & runner to Neon
 2018-03-27 17:15:45 -04:00
Nicole Thomas
bd1e8bcc7d
Merge pull request #46734 from terminalmage/busybox 
Make busybox image builder work with newer busybox releases
 2018-03-27 17:14:28 -04:00
Nicole Thomas
c09c6f819c
Merge pull request #46742 from gtmanfred/2017.7 
only use npm test work around on newer versions
 2018-03-27 17:13:28 -04:00
Erik Johnson
ae0f112a49
Log an exception when non-string val/expr passed to expr_match 
This also removes inaccurate logging from check_whitelist_blacklist
 2018-03-27 16:13:04 -05:00
Nicole Thomas
3b6d5eca88
Merge pull request #46743 from Ch3LL/mac_auth 
Workaround getpwnam in auth test for MacOSX
 2018-03-27 17:10:47 -04:00
Daniel A. Wozniak
62d64c9230
Fix missing import 2018-03-27 14:10:24 -07:00
rallytime
d0278345fc
Update old utils paths to new utils paths 2018-03-27 16:45:16 -04:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
Gareth J. Greenaway
0b30955c00
Including salt.utils.dateutils so various jinja_filters are available when using salt-ssh. 2018-03-27 13:17:52 -07:00
Ch3LL
4f1c42c0e3
Workaround getpwnam in auth test for MacOSX 2018-03-27 15:18:29 -04:00
Daniel Wallace
fd0e649d1e
only use npm test work around on newer versions 
The workaround only needs to be applied to versions of npm newer than 5.1, but
they work with versions newer than 5.0, so just do all newer versions using the
work around
 2018-03-27 13:51:21 -05:00
Nicole Thomas
c83d9e66fe
Merge pull request #46733 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-27 14:46:42 -04:00
Daniel A. Wozniak
18b1730320
Skip test that requires pywin32 on *nix platforms 2018-03-27 11:38:20 -07:00
rallytime
5336e866ac
Update release versions for the 2017.7 branch 2018-03-27 14:25:16 -04:00
rallytime
4d9fc5cc0f
Update release versions for the 2016.11 branch 2018-03-27 14:25:12 -04:00
Nicole Thomas
b548a3e742
Merge pull request #46171 from amaclean199/fix_mysql_grants_comparison 
Fix mysql grant comparisons
 2018-03-27 13:54:47 -04:00
Daniel A. Wozniak
ec4634fc06
Better explanation in doc strings 2018-03-27 10:35:51 -07:00
Erik Johnson
6502b6b4ff
Make busybox image builder work with newer busybox releases 2018-03-27 10:55:52 -05:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
Nicole Thomas
223bb4f8fd
Merge pull request #46723 from garethgreenaway/46716_salt_states_x509_error_on_py3 
[2018.3.0rc1] fixes to x509 module and state for PY3
 2018-03-27 11:29:52 -04:00
Dmitry Kuzmenko
bf0b962dc0
Workaroung python bug in traceback.format_exc() 
The function raises an AttributeError if there is no current exception.
https://bugs.python.org/issue23003
 2018-03-27 11:03:03 -04:00