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
82,494 Commits 24 Branches 182 Tags 341 MiB
7aa31ff030
Commit Graph

82494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Erik Johnson
663874908a pkg.installed: pack name/version into pkgs argument 
This allows a version of 'latest' to work when just a name and version
is passed.
 2017-07-13 13:04:09 -05:00
Nicolas Geniteau
357dc22f05 Fix user creation with empty password 
Emptying the password was only done if the user already existed, not
when creating.

Signed-off-by: Nicolas Geniteau <nicolas@cri.epita.net>
 2017-07-13 12:32:15 -04:00
rallytime
f2250d474a Add a note about using different styles of quotes. 2017-07-12 17:08:23 -06:00
rallytime
f032223843 Handle libcloud objects that throw RepresenterErrors with --out=yaml 
Fixes #42152
 2017-07-12 14:19:35 -06:00
twangboy
ed89cd0b93 Use os.sep for path seps 2017-07-12 10:13:26 -06:00
Nicole Thomas
a91a3f81b1 Merge pull request #42123 from vutny/fix-master-utils-import 
DOCS: describe importing custom util classes
 2017-07-12 09:53:23 -06:00
rallytime
bd638880e3 Add mono-spacing to salt-minion reference for consistency 2017-07-12 09:36:07 -06:00
Denys Havrysh
6bb8b8f98c Add missing doc for `utils_dirs` Minion config option 2017-07-12 11:08:34 +03:00
Denys Havrysh
f1bc58f6d5 Utils: add example of module import 2017-07-12 11:08:34 +03:00
rallytime
38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs 
Fixes #41721
 2017-07-11 17:28:45 -06:00
Nicole Thomas
e2aa5114e4 Merge pull request #42261 from rallytime/minor-doc-fix 
Some minor doc fixes for dnsutil module so they'll render correctly
 2017-07-11 17:14:53 -06:00
Nicole Thomas
3e9dfbc9cc Merge pull request #42262 from rallytime/bp-42224 
Back-port #42224 to 2016.11
 2017-07-11 17:14:24 -06:00
rallytime
78cdee51d5 Gate boto_elb tests if proper version of moto isn't installed 
For Python 2 tests, we can use an older version. But when running
these tests of Python 3, we need a newer version of moto that supports
Python 3.

This gates the tests if the expected version of moto is missing.
 2017-07-11 17:00:50 -06:00
rallytime
30d62f43da Update minion restart section in FAQ doc for windows 
Fixes #41116
 2017-07-11 16:24:29 -06:00
Thomas Dutrion
c31ded341c Remove duplicate instruction in Openstack Rackspace config example 2017-07-11 16:01:15 -06:00
rallytime
8c76bbb53d Some minor doc fixes for dnsutil module so they'll render correctly 2017-07-11 15:57:32 -06:00
Nicole Thomas
7780579c36 Merge pull request #42181 from garethgreenaway/42137_backport_fix_from_2017_7 
fixes to state.py for names parameter
 2017-07-11 15:21:31 -06:00
Nicole Thomas
72537868a6 Merge pull request #42253 from gtmanfred/2016.11 
Only use unassociated ips when unable to allocate
 2017-07-11 14:53:50 -06:00
Nicole Thomas
b2a4698b5d Merge pull request #42252 from UtahDave/2016.11local 
simple docstring updates
 2017-07-11 14:48:32 -06:00
twangboy
55b278c478 Mock the reg.read_value function 2017-07-11 13:23:11 -06:00
twangboy
45be32666a Add error-handling function to shutil.rmtree 2017-07-11 13:08:00 -06:00
Daniel Wallace
53e25760be Only use unassociated ips when unable to allocate 
When checking the unassociated ips first, in Parallel mode, each server will
use the same one unallocated ip.
 2017-07-11 10:47:16 -06:00
David Boucha
e6a9563d47 simple doc updates 2017-07-11 10:19:22 -06:00
Mircea Ulinic
1ac69bd737 Document the provider option and rearrange the doc 2017-07-11 14:44:51 +00:00
Mircea Ulinic
4bf4b14161 New option for napalm proxy/minion: provider 
This option will turn very handy for environemnts when the user
requires a library with a different name than napalm-base (eventually
on top of the public lib). The sole requirement right now is to
preserve the get_network_driver function. However, this can be enhnaced
even from this perspective later, if really needed.
 2017-07-10 20:29:35 +00:00