8831 Commits

Author	SHA1	Message	Date
rallytime	862c44c036	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-09-05 09:41:04 -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	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	da3a29c680	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/integration/states/test_file.py	2018-08-28 12:06:32 -04:00
Erik Johnson	d69e3e1a27	Add separate deserializer_opts argument to file.serialize ... The functions to load and dump data don't have the same arguments, so it's not a good idea to pass the same kwargs to both and then capture the inevitable traceback that will be the result. Instead, this adds a separate `deserializer_opts` argument which will be used only in the case where `merge_if_exists` is set to `True`.	2018-08-24 18:12:05 -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
Daniel Wallace	02823e5768	Merge pull request #48873 from dmacvicar/terraform_roster_3 ... Terraform roster module to be used with terraform-provider-salt	2018-08-17 19:38:40 -05:00
rallytime	6e6091c3ba	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/integration/runners/test_cache.py - tests/support/case.py	2018-08-14 09:57:37 -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	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
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
Mircea Ulinic	29b84bb047	More small corrections	2018-08-08 21:43:11 +01: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
Mircea Ulinic	a7410c9db1	Small corrections	2018-08-08 16:22:09 +01:00
Mircea Ulinic	0aebde0df3	Add NetBox and PeeringDB, as well as list all the new modules	2018-08-08 16:07:47 +01:00
Mircea Ulinic	69466182b5	Document the new network automation features	2018-08-08 15:35:05 +01: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	26ef48814e	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/virt.py - tests/integration/shell/test_matcher.py	2018-08-07 11:00:42 -04:00
rallytime	64fe3be41a	Update man pages for 2017.7.8 release	2018-08-07 09:35:01 -04:00
Nicole Thomas	d97178c12a	Merge pull request #48919 from loverend/add_google_chat ... Add new google_chat module	2018-08-06 15:49:32 -04:00
Luke Overend	969d7d68fc	Add new google_chat module ... To send a message directly to google chat via the api (not via a bot) you need to configure a webhook and post directly to that webhook url.	2018-08-06 13:37:18 +01:00
Mircea Ulinic	dfe18bf48b	Add SCP module autodoc	2018-08-05 22:12:57 +01:00
Nicole Thomas	084e7f0ef4	Merge branch '2018.3' into jid	2018-08-05 15:16:41 -04:00
Nicole Thomas	a9daa92d73	Merge pull request #47621 from dwoz/win_runas ... Runas any user even when shell is limited like winrm	2018-08-05 14:29:50 -04:00
Nicole Thomas	d51cbc689c	Merge pull request #48879 from mirceaulinic/napalm-formula ... Adding an execution module providing helpers for the NAPALM formulas	2018-08-05 14:25:10 -04:00
Nicole Thomas	e73131a7a7	Merge pull request #48917 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-08-05 10:36:57 -04:00
Daniel A. Wozniak	09c12532a3	Fix doc change conflicts	2018-08-03 12:41:40 -07:00
Daniel A. Wozniak	b6fce06d66	Update release notes with runas changes	2018-08-03 12:32:33 -07:00
Daniel A. Wozniak	25e7b041f1	Document runas password changes	2018-08-03 12:32:33 -07: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
Nicole Thomas	b656c5884a	Merge branch 'develop' into return-codes	2018-08-03 11:49:29 -04:00
Nicole Thomas	8c5b369be0	Merge pull request #48660 from garethgreenaway/jids_in_logs ... [develop] Adding jids in master & minion logs	2018-08-03 11:22:56 -04:00