293 Commits

Author	SHA1	Message	Date
Alberto Planas	58279b4211	Documentation: fix typo in "equivalent" ... (cherry picked from commit a91676c2d5)	2019-01-31 10:53:14 +01:00
Ch3LL	3a85c5b33f	Update man pages for 2019.2.0	2019-01-08 14:35:36 -05:00
rallytime	46c0e50638	Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/man/salt.7	2018-10-03 09:45:20 -04: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	0c8b412556	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/integration/modules/test_archive.py	2018-09-04 12:05:48 -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	da3a29c680	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/integration/states/test_file.py	2018-08-28 12:06:32 -04: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
rallytime	5ff1ddb0dd	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/cmdmod.py - salt/utils/schedule.py - tests/integration/files/conf/master - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py - tests/integration/scheduler/test_eval.py	2018-08-10 14:18:34 -04: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	6c8fb063ac	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-07-13 11:00:26 -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	bf6c788350	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/client/ssh/__init__.py - salt/utils/thin.py	2018-06-30 09:48:06 -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
Max Arnold	00798a9e33	Fix quite common Exception typos	2018-06-21 14:22:44 +07: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
Brendan Beveridge	cc85427724	add support for no_proxy for apt pkg and generic http util	2018-06-13 15:41:09 -04:00
rallytime	8d3c2be61c	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/modules/opkg.py - salt/modules/useradd.py - salt/output/table_out.py - salt/states/mysql_query.py - salt/states/user.py	2018-05-23 12:57:58 -04:00
plastikos	2ddd589f68	Merge branch 'develop' into improvement-spm-base_paths	2018-05-17 23:09:05 -06:00
rallytime	969296ecbe	Merge branch '2018.3' into 'develop' ... No conflicts.	2018-05-15 12:38:01 -04: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
Thayne Harbaugh	a66802c75a	Various clean-ups, fixes and improvements to SPM directory references ... in the base paths used in syspaths.py.	2018-05-04 17:41:57 -06:00
rallytime	5b50eaf6b0	Merge branch '2018.3' into 'develop' ... Conflicts: - doc/ref/proxy/all/salt.proxy.cimc.rst - doc/ref/proxy/all/salt.proxy.panos.rst - doc/topics/releases/2018.3.0.rst - salt/modules/cmdmod.py - salt/modules/state.py - salt/utils/schedule.py - tests/integration/modules/test_state.py	2018-04-05 13:25:46 -04: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	ed46ce3c74	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/auth/ldap.py - salt/modules/zfs.py - salt/modules/zpool.py - salt/states/cmd.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py - tests/integration/scheduler/test_postpone.py - tests/unit/grains/test_core.py	2018-03-02 11:55:06 -05:00
rallytime	a731047e59	Add man pages for oxygen release	2018-02-23 12:15:13 -05:00
xy@zhihu.com	be8427fdc9	pip.list_all_versions now can read index_url	2018-02-09 17:46:32 +08:00
Nurono	dd5fa715f8	Fix an inconsistency in the docs ... ``salt.runners.fileserver`` has no function ``clear_list_cache`` Its name should be ``clear_file_list_cache`` instead.	2018-01-30 14:44:14 +03: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