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

94494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihai Dinca
6d691b290b
Prepend current directory when path is just filename 2018-08-24 13:50:42 -04:00
Nicole Thomas
7a89a4c8aa
Merge pull request #49311 from rallytime/bp-49303 
Back-port #49303 to 2018.3.3
 2018-08-24 13:48:23 -04:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts 
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
 2018-08-24 10:46:50 -07:00
Daniel Wallace
b65890c363
Merge pull request #49305 from terminalmage/issue48299 
Allow git.latest to remove local tags which have been removed remotely
 2018-08-24 12:29:02 -05:00
Daniel Wallace
459354a6a3
Merge pull request #49308 from terminalmage/issue49009 
Don't include ignored paths in mtime map
 2018-08-24 12:28:41 -05:00
rallytime
1a5ef996e3
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 13:00:43 -04:00
Erik Johnson
549f5d5a86
Allow compound matching in eauth config expressions 
When we try to match the configured expression, we look for a match type
(e.g. `I@`, `G@`, etc.) at the beginning, and when we don't find one we
were falling back to a glob. This changes the fallback to compound so
that we can support compound matches. Note that the compound matching
engine will act just like the glob match engine when the host passed to
it is a single minion ID glob, so using compound as the fallback gets
you glob matching for free.
 2018-08-24 12:59:55 -04:00
Nicole Thomas
914bb09667
Merge pull request #49282 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-24 12:45:49 -04:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions 2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings 2018-08-24 09:35:00 -07:00
Ch3LL
da71c97073
Fix keyerror in manage.bootstrap 2018-08-24 10:58:10 -04:00
Daniel Wallace
3fe1387751
use os._exit instead of sys.exit when daemonizing 
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075
 2018-08-24 10:29:52 -04:00
Daniel Wallace
4c81c2ecf3
Merge pull request #49303 from gtmanfred/forking 
use os._exit instead of sys.exit when daemonizing
 2018-08-24 09:15:54 -05:00
rallytime
21a51c9336
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 09:44:15 -04:00
Nicole Thomas
7bb356f11e
Merge pull request #49294 from Ch3LL/fed_28_tests 
Move run_function call from __init__ to setup
 2018-08-24 08:41:34 -04:00
Nicole Thomas
a607f9332f
Merge pull request #49302 from twangboy/fix_installer_2018.3.3 
Fix installer 2018.3.3
 2018-08-24 08:41:14 -04:00
Nicole Thomas
c7bae5e795
Merge pull request #49290 from rallytime/bp-44504 
Back-port #44504 to 2017.7
 2018-08-24 08:35:43 -04:00
Erik Johnson
2badd7f78f
Don't include ignored paths in mtime map 
Fixes #49009
 2018-08-24 07:10:39 -05:00
Erik Johnson
4a093d97fb
lint 2018-08-24 06:40:36 -05:00
Erik Johnson
ed7b99453c
Gate tag manipulation behind a sync_tags argument 2018-08-24 06:40:36 -05:00
Erik Johnson
29de855ede
Add test for a removed tag 2018-08-24 06:40:36 -05:00
Erik Johnson
eb9a4594b6
Properly handle tags deleted from remote repository 2018-08-24 06:40:36 -05:00
Erik Johnson
916c15a04d
Add git.tag function 2018-08-24 06:40:36 -05:00
Daniel A. Wozniak
e84e60857c
Fix wart in file state test 2018-08-23 21:00:35 -07:00
Daniel Wallace
e06ce49c1b
use os._exit instead of sys.exit when daemonizing 
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075
 2018-08-23 19:08:39 -05:00
twangboy
68fd37575e
Fix erroneous NSSM reference 2018-08-23 17:28:56 -06:00
twangboy
103f2c289e
Remove delete vcredist line 2018-08-23 17:24:38 -06:00
Daniel A. Wozniak
71d4465b6c
Work around cmd.run unicode issues in test for now 
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
 2018-08-23 16:21:20 -07:00
twangboy
007a16638e
Bring installer updates from 2017.7.8 to 2018.3.3 2018-08-23 17:13:53 -06:00
rallytime
196ce3f75e
Call the with_tempfile decorator correctly for 2018.3 2018-08-23 16:37:03 -04:00
rallytime
37f24fda78
Fix unit test for file state 
Chose the wrong side of a merge conflict resolution. This commit restores
the correct testing behavior.
 2018-08-23 16:18:29 -04:00
Ch3LL
0a5d44a3db
Move run_function call from __init__ to setup 2018-08-23 15:34:27 -04:00
Daniel Wallace
7a44e5967b
Merge pull request #49289 from rallytime/bp-49170 
Back-port #49170 to 2017.7
 2018-08-23 13:47:16 -05:00
Megan Wilhite
1bbe7df6c4
Merge pull request #49284 from twangboy/fix_installer_osx 
Fix path to libsodium tarball
 2018-08-23 13:19:24 -04:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it 2018-08-23 13:08:04 -04:00
Dawid Pogorzelski
4c29c17197
forcing mine update in the proxy minion as well 2018-08-23 13:03:24 -04:00
Dawid Pogorzelski
b1d581a2cf
force mine update on minion start 
this should solve https://github.com/saltstack/salt/issues/42449
 2018-08-23 13:03:17 -04:00
Nicole Thomas
158c1ca575
Merge pull request #49276 from terminalmage/fix-moved-funcs 
Fix paths to moved functions
 2018-08-23 12:38:54 -04:00
Nicole Thomas
221ea22dd0
Merge pull request #49278 from rallytime/bp-49253 
Back-port #49253 to 2017.7
 2018-08-23 12:28:03 -04:00
Anthony ARNAUD
6c0fb9cff1
Fix #49281 etcd_cache with mine cache 
Signed-off-by: Anthony ARNAUD <github@anthony-arnaud.fr>
 2018-08-23 12:26:25 -04:00
Mike Place
ef39f85fac
Merge pull request #49270 from dwoz/test_event_fix 
Add async helper to test_sock_path_len
 2018-08-23 10:17:54 -06:00
twangboy
a112eaa597
Fix path to libsodium tarball 2018-08-23 10:15:28 -06:00
rallytime
6f9a158661
Update old utils paths with new paths 2018-08-23 11:52:49 -04:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Daniel Wallace
b331b5ce0c
skip ID 7 for vmware hard drives 2018-08-23 10:44:46 -04:00
Daniel Wallace
5da743adff
Merge pull request #49199 from jacobweinstock/fix-typeerror-unicode 
Fix typeerror unicode
 2018-08-23 09:38:16 -05:00
Nicole Thomas
e28f8f1ae0
Merge pull request #49264 from gtmanfred/diskusage 
fix diskusage beacon
 2018-08-23 10:36:06 -04:00
Daniel Wallace
f6b2b93afe
Merge pull request #49253 from gtmanfred/vmware 
skip ID 7 for vmware hard drives
 2018-08-23 09:35:30 -05:00
Daniel Wallace
e0e8779985
Merge pull request #49272 from twangboy/fix_installer_more 
Add 64 bit binaries for KB2999226 to the x86 installer
 2018-08-23 09:27:09 -05:00
Erik Johnson
322a988def
Fix paths to moved functions 2018-08-23 08:32:11 -05:00