276 Commits

Author	SHA1	Message	Date
Frode Gundersen	0cbe3f8bb5	Update man pages for 2018.3.4	2019-02-06 17:35:33 +00:00
rallytime	0e761036f1	Merge branch '2018.3.3' into '2018.3' ... No conflicts.	2018-09-30 12:39:44 -04:00
Ch3LL	a418ef87b1	Update man pages for 2018.3.3	2018-09-21 16:18:36 -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	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
Chris Speidel	f7ac085eb5	minor doc fix in netyang.py	2018-08-09 14:45:40 -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
rallytime	64fe3be41a	Update man pages for 2017.7.8 release	2018-08-07 09:35:01 -04: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	fface7cc74	Merge branch '2018.3.2' into '2018.3' ... Conflicts: - tests/integration/runners/test_state.py	2018-06-28 10:05:18 -04:00
rallytime	8893bf0d4c	Update man pages for 2017.7.7	2018-06-14 17:43:13 +00:00
rallytime	8c340134f5	Update man pages for 2018.3.2	2018-06-14 17:26:13 +00:00
rallytime	dd3e6f3f0a	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/states/pkgrepo.py	2018-05-15 12:29:29 -04:00
rallytime	ade5e9f664	[2018.3.1] Update man pages	2018-05-09 18:17:22 +00:00
rallytime	48ecb78dec	[2017.7.6] Update man pages	2018-05-07 20:31:38 +00:00
rallytime	e312efb5e7	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/modules/cmdmod.py - salt/modules/pillar.py - salt/modules/yumpkg.py - salt/state.py - salt/utils/pkg/rpm.py - salt/utils/schedule.py - tests/integration/states/test_npm.py - tests/integration/states/test_pkgrepo.py	2018-03-27 16:31:55 -04:00
rallytime	782a5584f5	Update man pages for 2017.7.5	2018-03-13 12:47:40 -04:00
rallytime	a731047e59	Add man pages for oxygen release	2018-02-23 12:15:13 -05:00
rallytime	ce3902b158	Merge branch '2017.7' into merge-oxygen	2018-01-28 08:51:03 -05:00
rallytime	0ad101d560	Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/man/salt.7 - salt/modules/git.py - salt/modules/pacman.py - salt/states/git.py - tests/integration/modules/test_mac_user.py - tests/support/parser/__init__.py	2018-01-26 17:27:03 -05:00
Elias Probst	bec78276f3	Replace left-over mistyped codename reference (Hellium → 2014.7.0)	2018-01-26 22:52:10 +01:00
rallytime	d4dac9f7cc	Merge branch '2016.11' into '2017.7' ... 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	2018-01-25 10:42:14 -05:00
rallytime	d31b41adeb	Update man pages for 2017.7.3 release	2018-01-24 13:46:43 -05:00
Ch3LL	529bc0c680	update release number for salt-call man page 2016.11.9	2018-01-19 16:10:27 -05:00
Ch3LL	11b7222148	Update man pages for 2016.11.9	2018-01-19 16:05:42 -05:00
Senthilkumar Eswaran	238941cd02	Fixing a typo in the troubleshooting document	2017-10-12 22:28:25 -07:00
rallytime	fca4e5563a	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py - tests/unit/utils/test_parsers.py	2017-09-22 09:40:03 -04:00
Silvio Moioli	4a35fe5019	multiprocessing minion option: documentation fixes	2017-09-21 11:30:21 +02:00
Silvio Moioli	625eabb83f	multiprocessing minion option: documentation fixes	2017-09-21 10:55:52 +02:00
Felix Dreissig	5b55fb2452	Fix comments about the "hash_type" option ... Previous mentions of the correct default value (it really is sha256) somehow got lost along the way. Also, some comments seem to have gotten duplicated instead of updated.	2017-05-09 11:10:29 -06:00
Vitali Quiering	91f2963922	Add logstash engine protocol to manual	2017-03-24 17:03:22 +01:00
John Kristensen	8e92152533	Add key_text option to apt pkgrepo.managed (closes #37936) ... It may not always possible or desirable to upload a GPG key to a keyserver (`keyid`/`keyserver`) or to host it on remote server (`key_url`). This just leaves storing the key in a state using a `salt://` URL. It seems like the states is the wrong place to hold this sort of data, and would be more suited to being in the pillar. Adding a `key_text` option to the apt `pkgrepo.managed` module, which accepts a GPG key in string form, can assist in importing a GPG key from pillar data.	2017-03-16 00:25:21 +11:00
Pedro Algarvio	40a64191a1	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
Mike Place	cbd66a0d3f	Merge pull request #39676 from F30/hash-comment ... Fix comments about the "hash_type" option	2017-02-27 13:11:40 -07:00
Felix Dreissig	5371bc0996	Fix comments about the "hash_type" option ... Previous mentions of the correct default value (it really is sha256) somehow got lost along the way. Also, some comments seem to have gotten duplicated instead of updated.	2017-02-26 23:24:54 +01:00
Felix Dreissig	78a185ab11	Fix comments about file backup directory ... The actual file state backup directory is called "file_backup" without a trailing 's'.	2017-02-26 22:49:29 +01:00
rallytime	c46f82c029	Merge branch '2016.11' into 'develop' ... Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt	2017-02-21 14:20:20 -07:00
Cory Wright	cc90d0d53f	The Reactor docs should use pillar='{}' instead of 'pillar={}'	2017-02-17 11:07:39 -06:00
Jean-Claude Computing	94f349a900	Fix documentation for detach's default value	2017-02-15 20:29:29 +01:00
rallytime	7b2341bbfd	Merge branch '2016.11' into 'develop' ... Conflicts: - doc/topics/releases/releasecandidate.rst - salt/modules/file.py - salt/states/file.py - salt/utils/network.py	2016-11-10 15:59:51 -07:00
Ronald van Zantvoort	cb445550a6	typofix	2016-11-08 01:13:12 +01:00
Ronald van Zantvoort	ae4e86ccc2	modify docs to utilize backend:requests	2016-11-07 22:28:32 +01:00
rallytime	e57fb947c6	Merge branch '2016.11' into 'develop' ... Conflicts: - salt/modules/status.py	2016-11-01 12:56:04 -06:00
Nicole Thomas	5328bc8d99	Update man pages for 2016.11 (#37354)	2016-10-31 13:09:01 -06:00
rallytime	8d3957f250	Merge branch 'carbon' into 'develop' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/boto_ec2.py - salt/modules/cmdmod.py - salt/modules/win_lgpo.py	2016-10-28 11:58:41 -06:00
rallytime	0df3feec3c	Merge branch '2016.3' into 'carbon' ... No conflicts.	2016-10-28 09:25:00 -06:00