4885 Commits

Author	SHA1	Message	Date
Nicole Thomas	2c6f8f5f9e	Merge pull request #44510 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-11-14 17:21:13 -05:00
rallytime	4e2280157a	Merge branch '2017.7' into 'develop' ... Conflicts: - .kitchen.yml - tests/unit/test_doc.py - tests/unit/utils/test_cloud.py	2017-11-13 12:27:59 -05:00
Gareth J. Greenaway	45c9a233dc	Merge branch 'develop' into req_any	2017-11-13 09:16:56 -07:00
Vitaliy	43e4861fc4	Fixed minor spelling mistake.	2017-11-10 12:30:12 -05:00
Gareth J. Greenaway	a8e495f18f	Updating documentation and release notes.	2017-11-08 16:06:44 -08:00
Nicole Thomas	8e99aeed6a	Merge pull request #44415 from vernondcole/vagrant_cloud_minor_revisions ... Vagrant and saltify cloud minor revisions	2017-11-08 15:22:18 -07:00
Erik Johnson	5932e8a8ae	Merge pull request #44407 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-11-08 11:50:05 -08:00
Nicole Thomas	76f3c001ee	Merge pull request #44430 from thatch45/doc_fix1 ... make it clear that disabling the job cache is bad	2017-11-07 15:53:10 -07:00
Nicole Thomas	a29eeeec66	Fix a couple of small spelling errors	2017-11-07 12:16:28 -07:00
Thomas S Hatch	bed56e9dd7	make it clear that disableing the job cache is bad	2017-11-07 10:14:40 -07:00
Ch3LL	38ca5520f0	Fix orch doc from pillat.get to pillar.get	2017-11-07 11:36:10 -05:00
Volodymyr Samodid	0c7f63e9d4	fix docstring errors during rendering	2017-11-07 10:24:56 +02:00
Vernon Cole	51a15cb2fc	try to ping node before Wake on Lan	2017-11-06 10:56:41 -07:00
rallytime	2c052e34b3	Merge branch '2017.7' into 'develop' ... Conflicts: - .gitignore - salt/modules/win_lgpo.py - salt/utils/__init__.py - tests/integration/spm/test_build.py - tests/unit/test_pydsl.py	2017-11-05 20:28:51 -07:00
Mike Place	06afbe4214	Merge pull request #44275 from rallytime/arch-doc ... Doc updates for architecture.rst file	2017-10-31 10:49:41 -06:00
Mike Place	d9a4cc22da	Merge pull request #44328 from rallytime/doc-fixes ... Add some clarifications to event and architecture documentation	2017-10-31 10:21:37 -06:00
rallytime	0574df20ce	Add some clarifications to event and architecture documentation	2017-10-29 15:08:57 -04:00
Nicole Thomas	9fc7fde8d2	Merge pull request #43885 from garethgreenaway/43825_swap_total_grain ... [develop] Adding swap_total to core grains	2017-10-27 13:01:11 -04:00
Nasenbaer	35c6a02689	Add sentry config deprecation to release notes	2017-10-26 10:29:43 +02:00
David Boucha	c919648ab4	Fix documentation grammar and spelling errors	2017-10-25 17:24:26 -06:00
Federico Pires	e7aebf46ce	Support softlayer dedicated host in salt-cloud. ... Update docs as well.	2017-10-25 10:58:12 -03:00
rallytime	fa7d290b7c	Doc updates for architecture.rst file ... - A couple of spelling fixes - Formatting fixes to make sure numbered lists display correctly - Remove header that was confusing	2017-10-25 09:46:56 -04:00
Vernon Cole	b7c0182d93	correct and clarify documentation	2017-10-20 09:24:26 -06:00
Vernon Cole	cea457efa0	more better documentation, fix parameter handling	2017-10-19 20:14:07 -06:00
Vernon Cole	d3769b3568	add saltify wake-on-lan and document it	2017-10-19 20:14:07 -06:00
Mike Place	866a78a673	Merge pull request #44176 from vernondcole/simplify-saltify ... Simplify saltify cloud driver	2017-10-19 14:37:17 -05:00
Nicole Thomas	e52aac2587	Merge pull request #43649 from twangboy/win_installer_multimaster ... Add support for multimaster setup	2017-10-19 09:20:44 -04:00
Gareth J. Greenaway	bcee88ce77	Adding note about new swap_total grain to release notes for Oxyten.	2017-10-18 14:57:32 -07:00
Vernon Cole	805d5106ed	remove references to salt-api from docs	2017-10-18 10:50:47 -06:00
rallytime	b8dc018178	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/modules/opkg.py - salt/utils/templates.py - tests/unit/templates/test_jinja.py	2017-10-18 09:37:47 -04:00
Mike Place	73c3581864	Merge pull request #44037 from vernondcole/vagrant-cloud ... Vagrant cloud and state modules	2017-10-17 14:36:38 -06:00
Tim Freund	9557504b75	Insert missing verb in gitfs walkthrough	2017-10-16 20:27:56 -04:00
Nicole Thomas	2fba45cd3f	Merge pull request #44125 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.2 to 2017.7	2017-10-16 16:02:24 -04:00
rallytime	c0f16dae74	Merge branch '2017.7' into 'develop' ... Conflicts: - doc/topics/tutorials/index.rst - salt/crypt.py - salt/modules/cmdmod.py - salt/modules/grains.py - salt/pillar/git_pillar.py - salt/roster/clustershell.py - tests/unit/states/test_augeas.py - tests/unit/utils/test_utils.py	2017-10-16 15:26:19 -04:00
Nicole Thomas	96dc6b0171	Merge pull request #44015 from gtmanfred/develop ... convert jinja context to dictionary	2017-10-16 14:39:29 -04:00
rallytime	c4ae4a6b50	Merge branch '2017.7.2' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.2.rst	2017-10-16 13:53:13 -04:00
twangboy	a0972704e5	Fix bad headings	2017-10-16 10:51:34 -06:00
twangboy	601d8bc5af	Add release notes	2017-10-16 10:51:34 -06:00
twangboy	e22b2a4856	Fix some grammer issues in the docs	2017-10-16 10:51:33 -06:00
twangboy	78124181cd	Fix typo	2017-10-16 10:51:33 -06:00
twangboy	7bcf8b48ec	Update documentation with new changes to installer	2017-10-16 10:51:33 -06:00
Benedikt Werner	1319c822bd	Fixed code snippet in unit testing doc	2017-10-16 17:23:23 +02:00
Erik Johnson	877abb89d0	Complete the salt.utils refactor ... This moves the remaining 30 functions from salt.utils to new locations.	2017-10-15 09:43:31 -05:00
garethgreenaway	22dbed1e45	Merge branch 'develop' into vagrant-cloud	2017-10-13 13:08:50 -07:00
Nicole Thomas	76cc5ba689	Merge branch 'develop' into develop	2017-10-13 11:44:17 -04:00
Nicole Thomas	b617c85519	Merge pull request #44084 from senthilkumar-e/doc_update ... Fixing a typo in the troubleshooting document	2017-10-13 10:29:50 -04:00
Nicole Thomas	0238a6d713	Merge pull request #44061 from Shinzu/develop ... Add option to eagerly scrub the disk	2017-10-13 09:57:02 -04:00
Senthilkumar Eswaran	238941cd02	Fixing a typo in the troubleshooting document	2017-10-12 22:28:25 -07:00
Vernon Cole	42c0c6e6ef	lint and documentation fixes	2017-10-12 13:11:12 -06:00
Markus	820add5551	Added version tag	2017-10-12 20:30:55 +02:00