saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
101342 commits 34 branches 292 tags 803 MiB
Commit graph

2722 commits

Author SHA1 Message Date
Erik Johnson
6db2beb6c0
Replace "pchanges" with "changes" to fix onchanges/prereq requisites 
Since "pchanges" was never supported in the state compiler, and
"changes" is what these reqs always used, replacing "pchanges" with
"changes" will allow those requisites to work in test mode.

Conflicts:
  - salt/states/file.py
  - salt/states/linux_acl.py
  - salt/utils/napalm.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_file.py
 2019-04-18 10:56:30 -04:00
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/states/linux_acl.py
  - salt/transport/ipc.py
 2019-03-28 11:10:45 -04:00
Daniel Wozniak
14a6b9d417
Merge pull request #52306 from terminal-labs/replace-ping-with-version 
Replaced `test.ping` with `test.version`
 2019-03-27 15:50:06 -07:00
Alan Cugler
c04ba6e35e
Changed a text artifact from the ping function to supporting text for the version function. 2019-03-26 09:58:26 -05:00
Gareth J. Greenaway
11cd485a8b
Merge branch '2018.3' into merge-2019.2 
Conflicts:
   - doc/topics/installation/freebsd.rst
 2019-03-25 13:42:28 -07:00
Alan Cugler
0b1eb00dc4
Replaced test.ping with test.version 
Result of issue #52277

Any where `test.ping` still exists in the docs was left
because of the context in those docs.
 2019-03-25 12:09:48 -05:00
Akmod
8e1ec15c39 Add missing master/minion docs for log_rotate* 
Adds log_rotate_backup_count and log_rotate_max_bytes to the
minion and master config documentation
Solves issue: #51921
 2019-03-22 11:26:01 -06:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/transport/zeromq.py
  - tests/unit/modules/test_kubernetesmod.py
  - tests/unit/modules/test_win_file.py
 2019-03-14 16:13:54 -04:00
Ch3LL
8a8a5fa89d
Add azure module ref pages and fix doc errors 2019-03-08 17:31:15 -05:00
Ch3LL
af0537fa39
Add azure state and execution modules to doc index 2019-03-07 12:00:08 -05:00
Daniel Wallace
1e7490c458
update kubernetesmod in index.rst 2019-03-01 13:52:27 -06:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod 
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
 2019-03-01 13:33:50 -06:00
Gareth J. Greenaway
186306a80c
reverting change in release notes, adding change to doc/ref/modules/all/index.rst. 2019-02-23 17:20:46 -08:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3 
Conflicts:
  - doc/ref/modules/all/index.rst
  - salt/states/file.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/modules/test_zypperpkg.py
  - tests/unit/states/test_file.py
 2019-02-22 16:38:15 -08:00
Daniel Wallace
33bb5bfe69
fix use of virtualname 
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
 2019-02-19 13:16:06 -06:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
 2019-02-15 15:09:36 -05:00
Erik Johnson
24aa083c65
Merge pull request #51598 from terminalmage/add-grain-option-documentation 
Add documentation for the metadata_server_grains config option
 2019-02-12 15:23:36 -06:00
Erik Johnson
9c02104fea
Add link to metadata grain module docs 2019-02-12 09:01:19 -06:00
Erik Johnson
997ce2650c
Add documentation for the metadata_server_grains config option 2019-02-12 08:56:48 -06:00
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-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/osx/build_env.sh
	salt/utils/dns.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/support/case.py
	tests/unit/utils/test_dns.py
 2019-02-11 15:45:43 -08:00
Mathieu Parent
7ca2aa4919
Allow dynamic file_roots 
Fixes: #48132
 2019-02-06 21:33:11 +01:00
Ch3LL
810c6119ec
Merge branch '2019.2.0.rc1' into 2019.2 2019-01-16 16:38:32 -05:00
Max Arnold
2f8e391279
Fix profile outputter docs 
Also remove the mention of obsolete "grains" output format.
 2019-01-14 15:14:07 -05:00
Ch3LL
09dd1cba8d
Update Fluorine references to 2019.2.0 2019-01-08 14:55:42 -05:00
Daniel Wozniak
9d4321ddac
Merge pull request #50878 from max-arnold/output-docs 
Fix profile outputter docs
 2019-01-08 11:32:39 -07:00
Gareth J. Greenaway
2ea7404d73
Merge branch '2018.3' into merge-fluorine 
Conflicts:
	salt/modules/aptpkg.py
 2019-01-07 10:04:56 -08:00
Gareth J. Greenaway
12f75834aa
Merge branch '2017.7' into merge-2018.3 
Conflicts:
   - pkg/osx/req.txt
   - pkg/windows/req.txt
 2019-01-01 13:35:41 -08:00
rallytime
43c39e7408
Add documentation to master config docs for job_cache_store_endtime 2018-12-24 14:22:25 -05:00
rallytime
887cd070ca
Add some salt-api options to the master config docs 2018-12-24 14:22:25 -05:00
rallytime
0d49746de8
Fix some formatting in master config docs 2018-12-24 14:22:24 -05:00
Gareth J. Greenaway
9c04986641
Merge branch '2018.3' into merge-fluorine 
Conflicts:
	doc/conf.py
	doc/topics/development/dunder_dictionaries.rst
	salt/client/ssh/ssh_py_shim.py
	salt/grains/core.py
	salt/modules/mysql.py
	salt/modules/state.py
 2018-12-20 17:20:42 -08:00
Max Arnold
d7403dae18 Fix profile outputter docs 
Also remove the mention of obsolete "grains" output format.
 2018-12-15 18:38:39 +07:00
Ch3LL
89b4e096db
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-12-14 11:15:48 -05:00
Jamie Bliss
98da110be2
Migrate Dynamic Module Distribution to Modular Systems. 2018-11-30 18:21:12 -05:00
Jamie Bliss
705e7e460f
Add a bunch of cross linking 2018-11-26 21:37:32 -05:00
Damon Atkins
a049cf4128
Merge branch 'fluorine' into win_pkg_min_repo 2018-11-17 01:45:50 +11:00
Damon Atkins
00ef561a9d update minion.rst with winrepo_cache_expire_min new default 2018-11-17 01:25:47 +11:00
Erik Johnson
ae96e29032
Fix docs configuration for renamed logstash engine 2018-11-13 19:05:29 -06:00
Erik Johnson
a4fc1087a3
Fix docs configuration for renamed logstash engine 2018-11-13 19:04:46 -06:00
Erik Johnson
ee835b10bc
Fix fluorine docs build warnings 2018-11-13 11:10:11 -06:00
Erik Johnson
7c298b27b0
Fix sphinx build warnings in 2018.3 branch 
The async renaming for Python 3.7 needed to be reproduced here as well.
 2018-11-13 10:17:37 -06:00
Erik Johnson
d4571328ed
Fix sphinx build warnings in 2018.3 branch 
The async renaming for Python 3.7 needed to be reproduced here as well.
 2018-11-13 08:47:12 -06:00
rallytime
533cc617ad
Extend deprecation warning for enable_legacy_startup_events to Sodium 
This deprecation warning only went in recently and is new in Salt "Fluorine".
We need 2 full feature releases for deprecation warnings and "Neon" would
have only been 1 feature release cycle.
 2018-11-01 16:46:07 -04:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Mike Place
f7f8cb533f
Merge pull request #50094 from rallytime/doc-errs 
Fix varstack_top naming in docs
 2018-10-18 12:49:24 +02:00
rallytime
1fbb84d934
Fix varstack_top naming in docs 
Warnings were generated in the doc builds about how `varstack` doesn't
exist. The file is named `varstack_top`.
 2018-10-17 10:31:45 -04:00
Mike Place
14f3fac0c4
Merge pull request #50056 from rallytime/bp-50029 
Back-port #50029 to 2018.3
 2018-10-16 11:12:58 +02:00
Daniel Wallace
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots 
Make Pillar no longer munge file_roots
 2018-10-15 16:58:08 -05:00
rallytime
1eaaab705f
Doc title formatting must match doc name length 2018-10-15 16:55:35 -04:00
Christian McHugh
6ac26b6c1e
add saltclass docs from release notes 2018-10-15 16:54:20 -04:00