5390 Commits

Author	SHA1	Message	Date
Sean Jenkins	fb6e895bf0	Merge remote-tracking branch 'upstream/develop' into develop	2015-12-30 09:43:05 -07:00
Sean Jenkins	1d7ee7bed2	Merge remote-tracking branch 'origin/develop' into sean	2015-12-30 08:44:30 -07:00
Andrew Colin Kissa	61ca281519	fix inline documentation examples not rendering ... add missing modules to indexes	2015-12-30 07:35:57 +02:00
rallytime	c386d70742	Merge branch '2015.8' into 'develop' ... Conflicts: - salt/modules/alternatives.py - salt/modules/boto_rds.py - salt/modules/mount.py - salt/states/boto_iam.py	2015-12-29 15:51:12 -07:00
rallytime	6176f383e5	Spelling fixes	2015-12-29 11:57:18 -07:00
rallytime	83c05729d6	Add Syndic documentation to miscellaneous Salt Cloud config options ... Fixes #30045	2015-12-29 11:53:49 -07:00
Sean Jenkins	41353b7ab3	Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead	2015-12-29 10:22:54 -07:00
Mike Place	e915f4b591	Merge pull request #30053 from akissa/add-postgres-privileges-support ... Add postgres privileges support	2015-12-29 09:50:44 -07:00
Andrew Colin Kissa	8066a06191	add postgres_language state module documentation	2015-12-29 13:13:37 +02:00
Andrew Colin Kissa	d27f0cc88a	add postgres_privileges ref docs	2015-12-29 13:02:56 +02:00
Jacob Hammons	a04cebd48c	Remove internal APIs from rest_cherrypy docs. ... Refs #28540	2015-12-28 15:26:16 -07:00
Jacob Hammons	32a352120a	updated spm docs	2015-12-28 14:29:02 -07:00
Mike Place	9e385369b7	Merge pull request #30034 from rallytime/bp-29893 ... Back-port #29893 to 2015.8	2015-12-28 13:20:51 -07:00
Mike Place	d8e1663ef1	Merge pull request #30031 from deuscapturus/patch-6 ... Update index.rst	2015-12-28 12:39:17 -07:00
Aditya Kulkarni	2fcf1590b8	Add info about VolumeType	2015-12-28 12:27:45 -07:00
rallytime	a257249789	Add versionadded to SSH Port docs	2015-12-28 12:24:04 -07:00
abednarik	0bb83e51aa	Updated Cloud msic section. ... Added ssh_port section.	2015-12-28 12:11:16 -07:00
Nicole Thomas	548d887510	Merge pull request #30003 from marnovdm/develop ... Adds thin provisioning support for new hard disks in VMware driver	2015-12-28 12:08:38 -07:00
Marno van der Molen	35bd10c5ba	Implement suggestions from rallytime, tries to adhere to same documentation style and fixes optional thin_provision configuration	2015-12-28 19:28:07 +01:00
Theodore Cowan	aa80bd2700	Update index.rst ... Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached. This should be fixed btw.	2015-12-28 10:47:40 -07:00
Thomas S Hatch	46471d83a7	Merge pull request #29999 from alprs/feature-require_without_state_type ... [WIP] requisites without explicitly providing the state module	2015-12-28 10:30:10 -07:00
Marno	72a5f6b554	Update documentation for vmware driver	2015-12-24 18:48:19 +01:00
Andreas Lutro	03ceaf103b	add documentation about omitting state modules in requisites	2015-12-24 13:07:44 +01:00
Seth House	7cc7a97b91	Clarified render step from worker pool step	2015-12-23 13:48:55 -07:00
Jonathan Ballet	e6e36372a4	doc: fix documentation link for salt.serializers	2015-12-23 10:13:16 +01:00
Seth House	75a95f5154	Add to Reactor docs to illustrate the end-goal and use with Orchestrate	2015-12-22 15:17:44 -07:00
Seth House	028f000743	Update opening Reactor paragraph for conciseness ... We're far removed from 0.11 now so the extra exposition is just noise.	2015-12-22 13:38:33 -07:00
Jorge Schrauwen	1294a1fa5c	probably a good idea to actually add salt.states.zpool	2015-12-22 19:16:18 +00:00
Jorge Schrauwen	da80dea902	try to get state.states.smartos docs go be generated	2015-12-22 19:11:46 +00:00
Jorge Schrauwen	f5333ee2f8	salt.modules.fmadm still does not have docs generated, trying again	2015-12-22 19:08:22 +00:00
Mike Place	c19782a184	Merge pull request #29853 from basepi/merge-forward-develop ... Merge forward from 2015.8 to develop	2015-12-22 08:05:49 -07:00
B M Corser	b89e9c6476	Presumably what was meant ... Otherwise it's invalid syntax	2015-12-21 21:17:23 +00:00
Aditya Kulkarni	61a9293af9	Add info about VolumeType	2015-12-21 11:26:53 -05:00
Jonathan Ballet	5aa0e9b1e0	Fix documentation typo for pillars	2015-12-21 13:26:02 +01:00
Jonathan Ballet	f2b41d04d7	Fix rendering issues for Cherrypy netapi documentation.	2015-12-21 13:26:02 +01:00
Jonathan Ballet	6922da46dc	doc: fix warnings + some rendering issues	2015-12-21 13:26:02 +01:00
abednarik	b7e7bf5a29	Updated Cloud msic section. ... Added ssh_port section.	2015-12-20 10:42:58 -03:00
Colton Myers	95fe811724	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/network.py salt/scripts.py salt/states/file.py salt/states/git.py salt/utils/event.py	2015-12-18 15:00:24 -07:00
Mike Place	7eefaac58a	Merge pull request #29814 from basepi/multi-master.windows.29396 ... [2015.8][Windows] Fix multi-master on windows	2015-12-18 10:16:52 -07:00
Mike Place	fb4eb28645	Merge pull request #29819 from rallytime/esxi-docs ... Add esxi module and state to docs build	2015-12-18 09:20:27 -07:00
Eric Mosher	0a765de370	Add infoblox documentation ... Closes #29780	2015-12-17 23:01:55 -05:00
Thibault Cohen	d37064951d	Add k8s modules and states documentation	2015-12-17 21:44:49 -05:00
rallytime	e7c5863468	Add esxi module and state to docs build ... Also fixed some minor doc errors	2015-12-17 16:33:59 -07:00
Colton Myers	2405501d75	Add documentation for tcp ipc_mode and multi-master	2015-12-17 14:08:41 -07:00
Mike Place	4044f3bb93	Merge pull request #29803 from rallytime/vsphere-docs ... Add vSphere module to doc ref module tree	2015-12-17 11:52:56 -07:00
Mike Place	5f2f128f64	Merge pull request #29804 from irtnog/fix-rhel-repo-config ... Fix a typo in the gpgkey URL	2015-12-17 11:50:46 -07:00
rallytime	3b7f5540ec	Add vSphere module to doc ref module tree	2015-12-17 10:54:28 -07:00
Mike Place	c4f226f31e	Merge pull request #29773 from l2ol33rt/debian_install_docfix ... Append missing wget in debian installation guide	2015-12-17 10:29:18 -07:00
Aditya Kulkarni	10bfcb8cb0	Add documentation about scopes (GCE)	2015-12-17 09:42:15 -07:00
Matthew X. Economou	f15a3648a4	Fix a typo in the gpgkey URL	2015-12-17 10:48:24 -05:00