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

85402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel A. Wozniak
d39f4852d8
Handle non-zero status exception 2018-03-29 14:39:40 -07:00
Daniel A. Wozniak
83c005802b
Handle cases where git can not be found 
Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>
 2018-03-29 14:39:29 -07:00
Daniel A Wozniak
628b87d5c4
Skip test when git symlinks are not configured 2018-03-22 23:30:15 -07:00
Mike Place
4e7466a21c
Merge pull request #46588 from UtahDave/no_crash_winshell 
Don't crash when saltwinshell is missing
 2018-03-21 20:26:30 +00:00
Mike Place
33af3cfc7c
Merge pull request #46631 from rallytime/update-pillar-unit-tests 
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists
 2018-03-21 19:22:48 +00:00
Mike Place
d329e7af78
Merge pull request #46640 from terminalmage/file.copy-docs 
Clarify the docs for the file.copy state
 2018-03-21 19:14:49 +00:00
Mike Place
ff40590c06
Merge pull request #46642 from vutny/doc-cloud-index 
[DOC] Unify cloud modules index header
 2018-03-21 19:13:28 +00:00
Denys Havrysh
51e6aa54a1
[DOC] Unify cloud modules index header 2018-03-21 17:17:28 +02:00
Erik Johnson
480c5f8faa
Clarify the docs for the file.copy state 2018-03-21 09:04:54 -05:00
David Boucha
b7842a1777 Update error message. 2018-03-20 18:31:43 -06:00
David Boucha
95dfdb91ca Don't stacktrace when salt-ssh w/o saltwinshell 2018-03-20 18:31:43 -06:00
rallytime
0f728186aa
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists 2018-03-20 17:49:58 -04:00
Nicole Thomas
83ed40c06a
Merge pull request #46619 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.5 to 2017.7
 2018-03-20 15:03:29 -04:00
Nicole Thomas
df12135439
Merge pull request #46584 from twangboy/lgpo-46568 
Fix issue LGPO issue
 2018-03-20 13:48:32 -04:00
Nicole Thomas
2fd3aa487c
Merge pull request #46624 from twangboy/win_fix_installer 
Fix a few inconsitencies in the installer script
 2018-03-20 13:47:43 -04:00
twangboy
fa0b0efe46
Fix some installer script inconsistencies 2018-03-20 09:54:36 -06:00
Nicole Thomas
f038e3c452
Merge pull request #46571 from garethgreenaway/46552_onfail_and_require 
[2017.7] fixes to state.py
 2018-03-20 09:40:03 -04:00
Nicole Thomas
2677330e19
Merge pull request #46520 from gtmanfred/2017.7 
pass utils to the scheduler for reloading in modules
 2018-03-20 09:35:48 -04:00
Nicole Thomas
7bc3c2e588
Merge pull request #46531 from terminalmage/issue44299 
Fix regression in yumpkg._parse_repo_file()
 2018-03-20 09:34:58 -04:00
Nicole Thomas
b80edb5d26
Merge pull request #46567 from dwoz/runtest-n-wart 
Honor named tests when running integration suites
 2018-03-20 09:24:41 -04:00
rallytime
bcbddf5d07
Merge branch '2017.7.5' into '2017.7' 
No conflicts.
 2018-03-20 09:10:38 -04:00
Nicole Thomas
19bb725698
Merge pull request #46612 from Ch3LL/7.5_rn 
Add changelog to 2017.7.5 release notes
 2018-03-19 16:47:37 -04:00
Ch3LL
6076bfa2ee
Add changelog to 2017.7.5 release 2018-03-19 16:36:41 -04:00
Gareth J. Greenaway
31c78aef11
Merge pull request #46572 from dmurphy18/update_xxxbuild 
Addition of -sa flag to allow for revision numbers other than -0 or -1
 2018-03-19 13:07:25 -07:00
Nicole Thomas
c87511570d
Merge branch '2017.7.5' into update_xxxbuild 2018-03-19 11:25:36 -04:00
Nicole Thomas
cdd768fa4d
Merge pull request #46577 from gtmanfred/2017.7.5 
Fix npm issue
 2018-03-19 07:51:03 -04:00
Nicole Thomas
e6682c660c
Merge pull request #46551 from terminalmage/salt-jenkins-885 
Fix failing pkg integration test on OpenSUSE
 2018-03-19 07:50:11 -04:00
twangboy
661017104b
Detect disabled reg_multi_sz elements properly 2018-03-16 14:45:06 -06:00
Nicole Thomas
1dcd22e767
Merge pull request #46580 from twangboy/win_update_docs_dism 
Clarify some issues with msu files in win_dism.py
 2018-03-16 14:57:54 -04:00
twangboy
d52b99d7a3
Clarify some issues with msu files in win_dism.py 2018-03-16 10:14:03 -06:00
Daniel Wallace
78cbf7b5cd
Fix npm issue 
Fixes saltstack/salt-jenkins#884
 2018-03-16 09:04:09 -06:00
David Murphy
0a541613f2 Additon of -sa flag to allow for revision numbers other than -0 or -1 2018-03-15 18:47:32 -06:00
Gareth J. Greenaway
152c43c843
Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. 2018-03-15 17:45:42 -07:00
Daniel Wallace
c76f7eb028
enable debug logging on the minionlog 2018-03-15 14:29:54 -06:00
Nicole Thomas
bd62699ccb
Merge pull request #46563 from gtmanfred/2017.7.5 
virtualenv version too old for python3.6
 2018-03-15 16:17:15 -04:00
Daniel A. Wozniak
3b6901e19d Honor named tests when running integration suites 2018-03-15 13:16:43 -07:00
Daniel Wallace
8d5ab72983
virtualenv version too old for python3.6 
This test is testing an old version of virtualenv with pip_env, and the version
of pip is 6.x.x, which is too old and doesn't work with the importlib in python
3.6. Skipping this test if python is newer then 3.5.
 2018-03-15 12:18:23 -06:00
Nicole Thomas
0a68c22332
Merge pull request #46541 from gtmanfred/metadata 
handle user-data for metadata grains
 2018-03-15 13:21:30 -04:00
Daniel Wallace
2916708124
Merge pull request #46561 from gtmanfred/2017.7.5 
disable verbose
 2018-03-15 10:36:40 -06:00
Daniel Wallace
2c39ac6dfb
disable verbose 2018-03-15 10:35:35 -06:00
Nicole Thomas
048b2ba3f6
Merge pull request #46547 from garethgreenaway/46427_service_module_cumulus 
[2017.7] Disable service module for Cumulus
 2018-03-15 12:14:59 -04:00
Nicole Thomas
98e3260b9a
Merge pull request #46548 from Ch3LL/profit_test 
profitbrick test: check for foo,bar username,password set in profitbrick config
 2018-03-15 10:25:27 -04:00
Nicole Thomas
79f2a76609
Merge pull request #46549 from Ch3LL/dimension_test 
Fix dimensionsdata test random_name call
 2018-03-15 10:23:40 -04:00
Erik Johnson
703b5e7e65
Change versionadded to show that 2018.3.0 will not have this function 2018-03-15 00:01:42 -05:00
Erik Johnson
010d260d06
Rewrite failing Suse pkg integration test 
This makes the test less brittle by hard-coding which package to use
 2018-03-14 23:35:25 -05:00
Erik Johnson
f3f5dec239
zypper.py: fix version argument being ignored 2018-03-14 23:34:36 -05:00
Erik Johnson
214f2d6ad3
Add pkg.list_repo_pkgs to zypper.py 2018-03-14 23:33:51 -05:00
Ch3LL
bb338c464c
Fix dimensionsdata test random_name call 2018-03-14 15:28:06 -04:00
Ch3LL
db96c4e72e
check for foo,bar username,password set in profitbrick config 2018-03-14 14:57:48 -04:00
Gareth J. Greenaway
edd0b11447
Merge branch '2017.7' into 46427_service_module_cumulus 2018-03-14 11:51:52 -07:00