2986 Commits

Author	SHA1	Message	Date
Joe Healy	b96d8ff1d9	Minor update to release notes for missing fix ... Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2015-12-09 12:30:52 +01:00
Benjamin Drung	e72354aac4	Fix typo specfic -> specific	2015-12-09 12:19:39 +01:00
Benjamin Drung	5708355762	Fix typo comparsion -> comparison	2015-12-09 12:17:49 +01:00
Mike Place	25d3a75d8c	Merge pull request #29540 from basepi/merge-forward-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2015-12-08 14:27:01 -07:00
Colton Myers	9673fd0937	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/cloud/clouds/ec2.py tests/unit/states/file_test.py	2015-12-08 12:23:26 -07:00
Mike Place	de7f3d5a59	Merge pull request #29504 from rallytime/fix-12072 ... Document userdata_file option for EC2 driver	2015-12-08 09:54:33 -07:00
Justin Findlay	917e6f850c	2015.8.2 notes: add note about not being released	2015-12-08 09:16:26 -07:00
rallytime	90b4823bc2	Switch volumes and del_*_on_destroy example ordering ... Refs #29101	2015-12-07 19:30:23 -07:00
rallytime	8357c95dc2	Document userdata_file option for EC2 driver ... Fixes #12072	2015-12-07 16:52:10 -07:00
abednarik	8e5c3e366a	Added Documentation note in salt cloud. ... Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.	2015-12-06 13:42:18 -03:00
Jacob Hammons	4f51a737f9	Added CVE 2015-8034 to 2015.5.8 release notes	2015-12-03 20:02:16 -07:00
jacobhammons	ab890b632a	Merge pull request #29417 from jacobhammons/repo-install-updates ... Repo install updates	2015-12-03 19:39:41 -07:00
Jacob Hammons	d58182c5fa	updated repo path for RHEL installation	2015-12-03 19:36:12 -07:00
twangboy	7bdddaca53	Fixed grammer	2015-12-03 11:18:32 -07:00
twangboy	d965d00a09	Fix #19332 ... Clarified precedence of pillar values	2015-12-03 11:15:46 -07:00
Jacob Hammons	5e54359869	Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes.	2015-12-03 10:55:32 -07:00
Justin Findlay	08ced73b13	Merge pull request #29315 from jfindlay/docs ... dev tutorial doc: fix markup errors	2015-12-01 14:42:17 -07:00
Colton Myers	0d90dd3a19	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: debian/salt-master.service salt/modules/win_pkg.py	2015-12-01 13:26:44 -07:00
Justin Findlay	e8e23dc444	dev tutorial doc: fix markup errors	2015-12-01 13:05:57 -07:00
Mike Place	1efaab2dd5	Fix typo in #29279	2015-11-30 13:59:47 -07:00
Justin Findlay	a5ea39132f	dev docs: add development tutorial	2015-11-30 13:11:13 -07:00
Justin Findlay	9236188867	Merge pull request #29214 from cro/ssl_verify_ssl ... Doc for salt.utils.http should say verify_ssl not ssl_verify.	2015-11-25 16:55:38 -07:00
C. R. Oldham	e9c13c561b	Doc bug--salt.utils.http takes verify_ssl not ssl_verify.	2015-11-25 15:57:31 -07:00
Trevor Hammond	48e0edd0d2	Fixes #29187 - using winrm on EC2	2015-11-25 18:36:45 +00:00
Justin Findlay	212f7dd281	add 2015.8.3 release notes	2015-11-24 17:06:40 -07:00
Justin Findlay	cafbb49cb6	add note on 2015.8.2 release notes	2015-11-24 17:05:41 -07:00
Colton Myers	525f9fbbbb	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-11-24 14:39:48 -07:00
Justin Findlay	be045f5cb1	add 2015.5.8 release notes	2015-11-23 16:21:45 -07:00
Colton Myers	233ab8a474	Merge pull request #29125 from basepi/merge-forward-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2015-11-23 11:48:46 -07:00
Colton Myers	8d86bc3056	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/states/rabbitmq_user.py salt/states/user.py	2015-11-23 09:53:11 -07:00
Bogdan Radulescu	4a7eee08a8	Documented import_keypair for the ec2 driver	2015-11-23 09:00:51 -07:00
Erik Johnson	139f5ba4c3	Add warning about pygit2 API instability	2015-11-20 22:34:58 -06:00
Mike Place	52e650aed9	Add section to style guide ... A brief discussion of variable naming standards in Salt.	2015-11-20 09:23:39 -07:00
Mathieu Le Marec - Pasquet	a4d197821a	LXC: doc	2015-11-18 13:34:56 +01:00
Mathieu Le Marec - Pasquet	43fb0eff02	lxc: remove useless and error prone uses_systemd knob	2015-11-18 13:34:53 +01:00
Colton Myers	f1c80ab943	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/utils/schedule.py	2015-11-17 16:18:12 -07:00
rallytime	61029f8db1	Change 2015.8.2 release note title to reflect proper version	2015-11-16 09:44:58 -07:00
Loren Gordon	64655398b3	Fix winrepo command in windows pkg mgmt doc	2015-11-15 20:03:46 -05:00
rallytime	60e6eddb77	A couple of spelling fixes for doc conventions page.	2015-11-15 14:49:47 -07:00
Justin Findlay	1f847fc9ba	add 2015.8.2 release notes	2015-11-13 10:29:21 -07:00
Justin Findlay	648b697951	add 2015.5.7 release notes	2015-11-13 10:13:21 -07:00
Colton Myers	4b706ac76a	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/troubleshooting/master.rst	2015-11-12 12:33:27 -07:00
Colton Myers	f8b8441485	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-11-12 11:01:07 -07:00
Nitin Madhok	9294ebd984	Provide ability to enable/disable customization for new VMs. Fixes #28429	2015-11-11 15:43:36 -05:00
Jacob Hammons	d7017be031	removed dependencies info from docs	2015-11-09 16:07:17 -07:00
Mike Place	1874300e08	Add note about recommended umask ... Closes #28199	2015-11-09 15:46:57 -07:00
Aditya Kulkarni	f4c297e794	Make sure versionchanged is correct	2015-11-06 10:38:48 -05:00
Mike Place	35dbca24e7	Merge pull request #28610 from pass-by-value/lxc_config_additions ... Lxc config additions	2015-11-05 11:43:05 -07:00
Aditya Kulkarni	83193641ca	Add doc about cloud lxc options	2015-11-05 12:15:30 -05:00
rallytime	eec9d69387	Merge branch '2015.5' into '2015.8' ... Conflicts: salt/modules/virtualenv_mod.py salt/states/file.py tests/integration/__init__.py	2015-11-04 15:52:59 -07:00