5281 Commits

Author	SHA1	Message	Date
Jacob Hammons	ebf72924d2	updated version numbers in documentation	2015-12-03 09:21:48 -07:00
Colton Myers	3f09d58fff	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/clouds/vmware.py salt/modules/rh_ip.py salt/modules/s3.py salt/modules/saltutil.py salt/modules/zypper.py salt/spm/__init__.py salt/utils/aws.py salt/utils/s3.py tests/unit/modules/s3_test.py tests/unit/pydsl_test.py	2015-12-01 15:31:03 -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
Mike Place	7e424e10f2	Merge pull request #28054 from dr4Ke/custom_grains_deep_merge ... loader uses a deep dictionary merge for the grains (core and customs)	2015-12-01 10:33:52 -07:00
Mike Place	7d276bdcd2	Merge pull request #29284 from cachedout/lint_29266 ... Add logentries engine	2015-11-30 14:48:32 -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
Mike Place	a6889cbdcb	Merge pull request #29228 from s0undt3ch/develop ... Fix the `engines_dirs` config option name.	2015-11-30 12:15:25 -07:00
Jimmy Tang	bdda03c456	Add logentries engine ... This engine is first attempt at a simple engine to send event information to the Logentries logging service.	2015-11-30 13:58:10 +00:00
Nitin Madhok	e30587d054	Updating docs for VMware cloud driver	2015-11-29 18:28:45 -05:00
Nitin Madhok	4fc2986b16	Updating docs for VMware cloud driver	2015-11-29 18:24:09 -05:00
Nitin Madhok	248c090af2	Updating/reorganizing docs for VMware cloud driver	2015-11-29 18:20:26 -05:00
Pedro Algarvio	d6d3d94b87	Fix the engines_dirs config option name.	2015-11-26 18:31:20 +00: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
Jorge Schrauwen	ed95e84b2b	generate docs for fmadm module	2015-11-25 14:43:38 +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	28b40de8da	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/client/ssh/__init__.py salt/client/ssh/ssh_py_shim.py salt/cloud/clouds/ec2.py salt/cloud/clouds/vmware.py salt/grains/philips_hue.py salt/modules/boto_ec2.py salt/modules/boto_route53.py salt/modules/dracr.py salt/modules/philips_hue.py salt/proxy/philips_hue.py salt/states/virtualenv_mod.py	2015-11-24 16:07:31 -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
Mike Place	040d89e0ad	Merge pull request #29051 from pass-by-value/manage_salt_proxy ... Manage salt proxy	2015-11-19 14:54:02 -07:00
Mike Place	645f687b54	Merge pull request #29055 from cachedout/style_variable_length ... Add section to style guide	2015-11-19 12:59:46 -07:00
Mike Place	3a7e5a105b	Add section to style guide ... A brief discussion of variable naming standards in Salt.	2015-11-19 12:01:18 -07:00
Aditya Kulkarni	4a3c8cc399	Add doc and test support	2015-11-19 12:51:45 -05:00
Jacob Hammons	b344ebfe4a	doc for salt.states.smartos	2015-11-18 17:21:57 -07:00
Christophe Drevet-Droguet	03fe8c7885	grains_deep_merge config option documentation	2015-11-18 20:48:11 +01: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
Peter Tripp	bc8c3724fd	Homebrew oneliner fix.	2015-11-17 22:30:51 -08:00
Colton Myers	d76d62877d	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/modules/git.py salt/renderers/gpg.py salt/utils/__init__.py	2015-11-17 16:24:43 -07: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
Colton Myers	efb479a1bd	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py salt/grains/chronos.py salt/grains/marathon.py salt/loader.py salt/modules/chronos.py salt/modules/marathon.py salt/proxy/chronos.py salt/proxy/marathon.py salt/state.py salt/states/chronos_job.py salt/states/marathon_app.py salt/states/user.py salt/utils/schedule.py	2015-11-13 15:18:45 -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
Colton Myers	8a23181dd7	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/modules/boto_secgroup.py salt/modules/rabbitmq.py salt/modules/win_system.py salt/modules/yumpkg.py salt/states/mount.py	2015-11-09 17:05:43 -07:00
jacobhammons	decc31a766	Merge pull request #28719 from jacobhammons/spm ... removed dependencies info from docs	2015-11-09 17:04:53 -07:00
Jacob Hammons	d7017be031	removed dependencies info from docs	2015-11-09 16:07:17 -07:00