valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,684 Commits 24 Branches 182 Tags 341 MiB
741928bfee
Commit Graph

8428 Commits

Author SHA1 Message Date
Gareth J. Greenaway
741928bfee
Fixes per request from @rallytime. 2018-09-27 08:44:06 -07:00
Gareth J. Greenaway
e66dc18805
Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up. 2018-09-27 08:44:06 -07:00
Erik Johnson
8393560642
Add warning about using jinja filters to dump dicts in Jinja 2018-09-20 14:56:26 -05:00
rallytime
b39dacf06c
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/pillar/cmd_yamlex.py
 2018-09-18 10:08:16 -04:00
Erik Johnson
7e5bab78c5
Fix docs build errors (2017.7 branch) 2018-09-17 22:35:08 -06:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py
 2018-09-06 12:08:01 -04:00
rallytime
de7ef3d681
Add "in progess" notation back to 2017.7.8 release notes 
We need this notation in the branch for now. We will remove it once the release
is live.
 2018-09-05 09:39:14 -04:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
Ch3LL
d40b6444a1
Update 2017.7.8 ChangeLog with new fixes 2018-09-04 17:28:50 -04:00
rallytime
2317b5ef58
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py
 2018-09-04 12:01:38 -04:00
rallytime
d1e51db8d3
Remove references to unused milestones in docs 2018-08-30 15:12:34 -04:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Erik Johnson
7372e9d6e3
Add minion documentation for enable_gpu_grains 2018-08-28 11:40:14 -05:00
Erik Johnson
ea1b53cb6f
Fix incorrect master docs for enable_gpu_grains 2018-08-28 11:39:53 -05:00
Erik Johnson
d1b7fb449c
Revert "Update documentation to correctly state enable_gpu_grains default" 
This reverts commit 2fe675cfdd.
 2018-08-28 11:17:32 -05: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
Mike Place
f8c55b85e1
Merge pull request #49184 from ralish/external_nodes_docs 
Remove obsolete documentation on external_nodes setting
 2018-08-18 08:50:10 -04:00
Samuel D. Leslie
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default 
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.
 2018-08-18 13:47:53 +10:00
Samuel D. Leslie
2e29b292bf
Remove obsolete documentation on external_nodes setting 
This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
 2018-08-18 13:11:02 +10:00
Ch3LL
f6b70bb653
Add changelog to 2017.7.8 release notes 2018-08-14 10:11:45 -04:00
Nicole Thomas
6942ef1102
Merge pull request #49096 from rallytime/new-doc-img-2018.3 
Update the DOCBANNER image for saltconf
 2018-08-13 15:59:38 -04:00
rallytime
75080705ce
Update the DOCBANNER image for saltconf 2018-08-13 15:56:44 -04:00
rallytime
90954203cb
Update the DOCBANNER image for saltconf 2018-08-13 15:10:56 -04:00
Nicole Thomas
98a8da728b
Revert "New logo 2017.7 (WIP)" 2018-08-10 17:22:03 -04:00
Mike Place
bbcd1869ec
Merge pull request #48982 from newwebash/new_logo_2017.7 
New logo 2017.7 (WIP)
 2018-08-10 22:21:28 +02:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - 	doc/man/salt.7
  - 	doc/ref/configuration/minion.rst
  - 	salt/cloud/clouds/ec2.py
  - 	salt/returners/highstate_return.py
  - 	tests/support/gitfs.py
  - 	tests/unit/loader/test_loader.py
 2018-08-10 13:12:14 -04:00
Chris Speidel
f7ac085eb5
minor doc fix in netyang.py 2018-08-09 14:45:40 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-09 13:34:17 -04:00
rallytime
3e6445a9d6
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/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
 2018-08-08 13:31:57 -04:00
Erik Johnson
0728b5f8b6
Add note about Python 3.5+ only support for optimization_order 2018-08-08 11:22:52 -05:00
Erik Johnson
0f60beb6b6
Fix bad copypasta 2018-08-08 11:22:52 -05:00
Erik Johnson
fbcd142ea2
Add configuration docs for optimization_order config option 2018-08-08 11:22:52 -05:00
Ashley Newton
5c1c311f77 Update Salt Conf ad 2018-08-07 13:49:26 -06:00
Ch3LL
757daf7d7e
add runas macosx warning in 2018.3.3 release notes 2018-08-07 15:49:26 -04:00
rallytime
64fe3be41a
Update man pages for 2017.7.8 release 2018-08-07 09:35:01 -04:00
Nicole Thomas
084e7f0ef4
Merge branch '2018.3' into jid 2018-08-05 15:16:41 -04:00
rallytime
8ca89df7e8
Update backticks on job_cache docs 
There's an extra backtick after the `job_cache` link, and not enough
backticks around `keep_jobs` parameter.
 2018-08-03 12:03:37 -04:00
Erik Johnson
7dce7cde14
Explictly document the configuration override priority 2018-08-02 11:19:22 -05:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-27 11:44:07 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use 
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
 2018-07-27 09:09:28 -04:00
Ch3LL
0cb4bac798
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:41:43 -04:00
Ch3LL
73b1fc29f0
Update Saltstack Logo banner on docs.saltstack.com 2018-07-24 16:01:49 -04:00
rallytime
dbc1f8b772
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 13:14:42 -04:00
rallytime
6df8fd8652
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 12:44:19 -04:00
Erik Johnson
7ad832c901
Add missing release notes mention of file.blockreplace changes 
These were added to the docstrings but not to the release notes for the
releases where the change took place.
 2018-07-21 10:12:52 -05:00
Bruno Binet
32b6d22cf2 Fix RST syntax issue in doc 2018-07-20 13:57:22 +02:00
Bruno Binet
37a41226d5 Add the "traverse" jinja filter 
which can be really useful in states to select some leaf pillar data or
fallback with a default value.
 2018-07-19 17:59:30 +02:00
rallytime
29b05ffdd1
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
  - pkg/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
 2018-07-11 14:49:27 -04:00
rallytime
a466a4880f
Merge branch '2017.7.7' into '2017.7' 
No conflicts.
 2018-07-10 16:49:13 -04:00
Erik Johnson
56e8a1eb93
Improve the slack engine docs 
This explains the target/tgt_type options, adds some usage examples, and
makes a few other documentation tweaks.
 2018-07-07 21:41:01 -05:00