valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,524 Commits 24 Branches 182 Tags 341 MiB
82982f940d
Commit Graph

82524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
82982f940d Merge pull request #42433 from terminalmage/issue42403 
Only force saltenv/pillarenv to be a string when not None
 2017-07-20 16:32:23 -05:00
Erik Johnson
17f347123a Only force saltenv/pillarenv to be a string when not None 
This fixes a regression introduced to make numeric saltenv/pillarenv
work properly.
 2017-07-20 13:55:06 -05:00
Nicole Thomas
a71938cefe Merge pull request #42408 from CorvinM/file-replace-doc-fix 
Fix documentation misformat in salt.states.file.replace
 2017-07-19 18:45:42 -06:00
Corvin Mcpherson
246a2b3e74 Fix documentation misformat in salt.states.file.replace 2017-07-19 19:29:20 -04:00
Mike Place
d385dfd19d Merge pull request #42347 from twangboy/win_fix_ver_grains 
Fixes problem with Version and OS Release related grains on certain versions of Python
 2017-07-19 12:05:43 -05:00
Mike Place
eb9e4206c9 Merge pull request #42366 from twangboy/win_fix_build 
Remove build and dist directories before install
 2017-07-19 11:37:40 -05:00
Mike Place
af7820f25d Merge pull request #42373 from Ch3LL/add_2017.7.1 
Add initial 2017.7.1 Release Notes File
 2017-07-19 11:28:46 -05:00
Nicole Thomas
59e012b485 Merge pull request #42150 from twangboy/win_unit_test_pip 
Fix `unit.modules.test_pip` for Windows
 2017-07-19 10:01:17 -06:00
Nicole Thomas
ade25c6b34 Merge pull request #42154 from twangboy/win_unit_test_reg 
Fix `unit.modules.test_reg_win` for Windows
 2017-07-19 10:00:38 -06:00
Nicole Thomas
07593675e2 Merge pull request #42182 from twangboy/win_unit_test_useradd 
Fix `unit.modules.test_useradd` for Windows
 2017-07-19 09:55:32 -06:00
Ch3LL
ce1c1b6d28 Add initial 2017.7.1 Release Notes File 2017-07-18 18:51:27 -04:00
Nicole Thomas
a175c40c1d Merge pull request #42364 from twangboy/release_notes_2017.7.0 
Windows Package notes for 2017.7.0
 2017-07-18 13:24:45 -06:00
Nicole Thomas
4dfe50e558 Merge pull request #42361 from Ch3LL/doc-update-2017.7 
[2017.7] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:22 -06:00
Nicole Thomas
587138d771 Merge pull request #42363 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-18 12:40:48 -06:00
Nicole Thomas
55b7a5cb4a Merge pull request #42340 from isbm/isbm-jobs-scheduled-in-a-future-2017.7-bsc1036125 
Bugfix: Jobs scheduled to run at a future time stay pending for Salt …
 2017-07-18 12:13:35 -06:00
Nicole Thomas
e72616c5f1 Merge pull request #42327 from mirceaulinic/patch-10 
Default skip_verify to False
 2017-07-18 12:04:36 -06:00
Nicole Thomas
ba799b2831 Merge pull request #42179 from rallytime/fix-42151 
Fix some documentation issues found in jinja filters doc topic
 2017-07-18 12:01:56 -06:00
twangboy
0946002713 Add blank line after delete 2017-07-18 11:28:49 -06:00
twangboy
f7c0bb4f46 Remove build and dist directories before install 2017-07-18 11:23:16 -06:00
twangboy
96517d1355 Add note about patched windows packages 2017-07-18 10:06:55 -06:00
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
 2017-07-18 09:05:43 -06:00
Nicole Thomas
b256001760 Merge pull request #42353 from terminalmage/fix-git-test 
is_windows is a function, not a propery/attribute
 2017-07-18 08:38:50 -06:00
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute 
While not fatal, this could potentially cause problems running this
test on Windows.
 2017-07-17 23:36:21 -05:00
Ch3LL
dc5bb301f7 [2017.7] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:56:56 -04:00
twangboy
ef1f663fc9 Detect server OS with a desktop release name 2017-07-17 13:44:25 -06:00
Mike Place
8dbb93851d Merge pull request #42087 from redmatter/fix-dockerng-volume-present-result-2017.7 
Make result=true if Docker volume already exists
 2017-07-17 13:41:47 -05:00
Mike Place
c84d6db548 Merge pull request #42186 from rallytime/fix-42166 
Use long_range function for IPv6Network hosts() function
 2017-07-17 13:39:35 -05:00
Mike Place
e7b79e0fd2 Merge pull request #42210 from terminalmage/issue40928-2017.7 
Only pass a saltenv in orchestration if one was explicitly passed (2017.7)
 2017-07-17 13:22:38 -05:00
Mike Place
0e49021b0e Merge pull request #42236 from cloudflare/napalm-provider 
New option for napalm proxy/minion: provider
 2017-07-17 13:19:55 -05:00
Mike Place
3ec5bb1c2f Merge pull request #42257 from twangboy/win_unit_pillar_test_git 
Fix `unit.pillar.test_git` for Windows
 2017-07-17 12:51:41 -05:00
Mike Place
36395625c2 Merge pull request #42258 from twangboy/win_unit_states_tests_environ 
Fix `unit.states.test_environ` for Windows
 2017-07-17 12:50:37 -05:00
Mike Place
894bdd2b19 Merge pull request #42265 from rallytime/gate-moto-version 
Gate boto_elb tests if proper version of moto isn't installed
 2017-07-17 12:47:51 -05:00
Mike Place
866a1febb4 Merge pull request #42264 from rallytime/fix-41116 
Update minion restart section in FAQ doc for windows
 2017-07-17 12:40:39 -05:00
Mike Place
9a707088ad Merge pull request #42275 from terminalmage/issue42194 
pkg.installed: pack name/version into pkgs argument
 2017-07-17 12:38:38 -05:00
Mike Place
e588f235e0 Merge pull request #42269 from rallytime/fix-41721 
Add some clarity to "multiple quotes" section of yaml docs
 2017-07-17 12:38:17 -05:00
Mike Place
baf04f2a2d Merge pull request #42277 from twangboy/win_unit_states_test_winrepo 
Fix `unit.states.test_winrepo` for Windows
 2017-07-17 12:37:06 -05:00
Mike Place
5aaa214a75 Merge pull request #42282 from rallytime/fix-42152 
Handle libcloud objects that throw RepresenterErrors with --out=yaml
 2017-07-17 12:36:34 -05:00
Mike Place
fb5697a4bc Merge pull request #42308 from lubyou/42295-fix-file-absent-windows 
Force file removal on Windows. Fixes #42295
 2017-07-17 12:12:12 -05:00
Mike Place
be6b211683 Merge pull request #42309 from terminalmage/fix-versionadded 
Change "TBD" in versionadded to "2017.7.0"
 2017-07-17 12:11:44 -05:00
Mike Place
acd29f9b38 Merge pull request #42206 from rallytime/fix-flaky-test 
[PY3] Fix test that is flaky in Python 3
 2017-07-17 12:09:52 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
Bo Maryniuk
774d204d65 Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) 2017-07-17 16:12:09 +02:00
Mike Place
da2a8a518f Merge pull request #42314 from rallytime/fix-42267 
Add clarification to salt ssh docs about key auto-generation.
 2017-07-17 09:07:49 -05:00
Mircea Ulinic
c830573a2c Trailing whitespaces 2017-07-16 23:09:19 +01:00
Mircea Ulinic
c83e6fc696 Default skip_verify to False 
This has been partially tackled in https://github.com/saltstack/salt/pull/41528,
but exactly the main entry point was missed.
 2017-07-15 23:24:07 +01:00
rallytime
c406046940 Add clarification to salt ssh docs about key auto-generation. 
Fixes #42267
 2017-07-14 11:57:58 -06:00
Nicole Thomas
acadd54013 Merge pull request #41945 from garethgreenaway/41936_allow_identity_files_with_user 
Fixes to modules/git.py
 2017-07-14 11:46:10 -06:00
Nicole Thomas
f90e04a2bc Merge pull request #42289 from CorvinM/bp-41543 
Multiple empty_password fixes for state.user
 2017-07-14 10:14:01 -06:00
Erik Johnson
603f5b7de6 Change "TBD" in versionadded to "2017.7.0" 2017-07-14 10:21:33 -05:00
Johannes Scholz
026ccf401a Force file removal on Windows. Fixes #42295 2017-07-14 15:55:23 +02:00