5188 Commits

Author	SHA1	Message	Date
Mike Place	9e13b5fd81	Merge pull request #46892 from samilaine/update-doc-topics-event-events ... Working Python examples for the event documentation.	2018-04-12 13:59:56 -06:00
Mike Place	800a91bf45	Merge pull request #47005 from ari/patch-3 ... Remove salt FreeBSD repo which is now 2 years out of date	2018-04-12 13:52:03 -06:00
Mike Place	cbe1cfa4d9	Merge pull request #46684 from isbm/isbm-saltssh-multimajor-py-version-support ... SaltSSH cross-major version support	2018-04-11 12:31:31 -06:00
Ari Maniatis	5db36d7bdb	Remove salt FreeBSD repo which is now 2 years out of date ... The saltstack repository has the 2016 version is current. Its not being updated, but there is a perfectly good port in the FreeBSD tree to use instead. Enhance the documentation on how to install that from binary or source.	2018-04-11 08:39:26 +10:00
Amir Pakdel	1a8a7e3841	Merge branch 'develop' into ec2_image_name	2018-04-09 11:49:14 -04:00
Sami Laine	8477465d2a	Review comments from @cachedout incorporated.	2018-04-09 10:05:30 +03:00
Bo Maryniuk	cd32f14406	Re-phrase docstring for alternative Salt installation	2018-04-06 17:38:14 +02:00
Bo Maryniuk	448944a317	Rephrase Salt SSH doc description	2018-04-06 17:38:14 +02:00
Bo Maryniuk	a0dd7a76e0	Add documentation about updated Salt SSH features	2018-04-06 17:38:14 +02: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
Mike Place	bc66641dd2	Merge branch 'develop' into ec2_image_name	2018-04-05 09:40:49 -05:00
Sami Laine	6e56dcac6b	Actually working Python examples for the event documentation.	2018-04-05 15:40:12 +03:00
Nicole Thomas	2a84c9595a	Merge pull request #46448 from ogd-software/allow_failhard_override ... Made state-level failhard override global failhard.	2018-04-04 17:12:00 -04:00
Amir Pakdel	6d649a948d	Added a bit a doc for Amazon EC2 AMI name	2018-04-04 14:59:19 -04:00
Nicole Thomas	c998e78570	Merge pull request #46833 from samilaine/pillar-include-missing-documentation ... Document the ignore_missing parameter for the pillar top file.	2018-04-04 10:50:42 -04:00
Nicole Thomas	92328dc0ed	Merge pull request #46724 from StackPointCloud/reserve_public_ip ... Reserve public IP block	2018-04-04 09:57:43 -04:00
Herbert	a74c90584f	Merge branch 'develop' into allow_failhard_override	2018-04-04 10:40:52 +02:00
Sami Laine	2e2c32e6ac	Typofix.	2018-04-04 10:39:18 +03:00
rallytime	ab2ccea1af	Quick grammar fix in 2018.3.0 release notes	2018-04-03 15:02:17 -04:00
David Boucha	af7bad3c7f	Fix warning format in 2018.3.0 release notes	2018-04-03 15:01:33 -04:00
David Boucha	37a04357b9	Fix warning format in 2018.3.0 release notes	2018-04-03 11:40:35 -06:00
rallytime	e75ba1f502	Merge branch '2018.3.0rc1' into '2018.3' ... Conflicts: - doc/topics/releases/2018.3.0.rst	2018-04-03 10:27:23 -04:00
Sami Laine	bfb5bdb0af	Document the ignore_missing parameter for the pillar top file.	2018-04-03 16:09:51 +03:00
Nicole Thomas	de4d9ac129	Merge pull request #46695 from StackPointCloud/public_private_ip ... Set public and private IP addresses	2018-04-03 08:45:58 -04:00
Nicole Thomas	3c741d5a08	Merge pull request #46722 from rallytime/fix-46721 ... Remove support for "profile" in vault util module	2018-04-03 08:41:32 -04:00
denza	14671418d8	Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip	2018-04-02 23:52:40 +02:00
denza	01f56f6ac5	Merge branch 'develop' of github.com:saltstack/salt into public_private_ip	2018-04-02 23:51:51 +02:00
Damon Atkins	db5b9464e6	provided an example	2018-03-31 02:20:07 +11:00
Damon Atkins	41e3e1e253	Update windows information in release notes	2018-03-31 02:07:50 +11:00
Damon Atkins	99447fbf49	Added more windows information	2018-03-31 02:05:26 +11:00
Damon Atkins	d4241006f2	Update 2018.3.0.rst Windows Items, Group topics ... Added windows changes and fixed headings and group similar items.	2018-03-31 01:28:12 +11:00
Ethan Devenport	fc67261e65	Merge branch 'develop' into public_private_ip	2018-03-29 11:31:04 -06:00
Nick Zeljkovic	41960137a8	Merge branch 'develop' into configserializer	2018-03-29 18:27:23 +02:00
Nicole Thomas	6fb83b7c83	Merge pull request #46694 from StackPointCloud/volume_password ... Volume password	2018-03-29 10:10:11 -04:00
Nicole Thomas	e5b3c8fa91	Merge pull request #46746 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-03-28 17:13:06 -04:00
Nicole Thomas	8267ced689	Merge pull request #46719 from rallytime/fix-46467 ... Remove support for expr_form	2018-03-28 17:11:08 -04:00
rallytime	e8864b7b0b	Merge branch '2017.7' into '2018.3'	2018-03-28 13:52:28 -04:00
Erik Johnson	885c60e7d4	Add serializer_opts feature to Fluorine release notes	2018-03-28 09:56:15 -05:00
Denys Havrysh	a1cc55da3d	[DOC] Remove mentions of COPR repo from RHEL installation page ... Fixes #28142	2018-03-28 12:30:07 +03:00
denza	01cf2aef62	Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip	2018-03-28 05:41:27 +02:00
denza	377d0c085f	Merge branch 'develop' of github.com:saltstack/salt into public_private_ip	2018-03-28 05:40:18 +02:00
denza	0e52faf8e7	Merge branch 'develop' of github.com:saltstack/salt into volume_password	2018-03-28 05:39:27 +02:00
denza	f53e186411	Fixing typo	2018-03-28 05:19:15 +02:00
Nicole Thomas	65bb37effd	Merge pull request #46720 from rallytime/bump-nacl-deprecation ... Bump deprecation notices in nacl module & runner to Neon	2018-03-27 17:15:45 -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	2c4668a5cb	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/states/netconfig.py - salt/states/zfs.py - tests/integration/cloud/providers/test_profitbricks.py - tests/integration/scheduler/test_eval.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py	2018-03-27 11:57:29 -04:00
rallytime	00d4eb26f3	Merge branch '2018.3.0rc1' into '2018.3' ... Conflicts: - pkg/windows/req.txt	2018-03-27 11:41:56 -04:00
rallytime	00490ec569	Update Fluorine release notes to use double back-ticks instead of single back-ticks ... RST formatting needs double backticks to properly display `code` font markings. The use of single backticks is used in markdown.	2018-03-27 11:27:12 -04:00
rallytime	b7491d9cd7	Update Fluorine release notes with link to vault module docs	2018-03-27 11:25:57 -04:00
rallytime	3cd716b349	Add example to release notes about tgt_type usage	2018-03-27 11:18:23 -04:00