2927 Commits

Author	SHA1	Message	Date
rallytime	1d727a545d	Require Network Helper over entire account ... Also fixed calling some functions so they don't stacktrace.	2015-10-02 12:30:19 -06:00
rallytime	a20462b9d9	Allow private ips to be used with the linode driver ... Alos updated the docs to include more provider/profile options and how they're used.	2015-10-02 12:06:05 -06:00
Mike Place	a668c3543b	Merge pull request #27554 from pass-by-value/doc_sphinx_version ... Update Sphinx version number in docs	2015-09-30 10:41:27 -06:00
Aditya Kulkarni	18868de6ea	Change Sphinx version number in docs	2015-09-30 11:46:06 -04:00
Colton Myers	41cad702e3	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/rest_service.py salt/states/dockerng.py salt/utils/cloud.py	2015-09-29 18:13:33 -06:00
Mike Place	a49cdab950	Minor doc fixup. ... Language and grammar changes.	2015-09-28 13:11:58 -06:00
ZhiFeng Hu	58ea4550ba	Doc: copy key to server via ssh-copy-id ... Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>	2015-09-26 22:55:00 +08:00
Jonathan Ballet	33db0c27f8	doc: fix RAET links	2015-09-25 12:16:47 -06:00
Meggie Woodfield	1c779700f6	Adding stretch label definition	2015-09-25 10:59:07 -06:00
jacobhammons	24e665335d	Merge pull request #27399 from multani/fix/docs ... Various documentation fixes	2015-09-25 09:42:52 -06:00
Jonathan Ballet	45aecdbffd	doc: fix RAET links	2015-09-25 10:36:19 +02:00
Jonathan Ballet	79d8ff38ca	doc: fixed RST markup on Salt Cloud functions	2015-09-25 10:20:53 +02:00
Jonathan Ballet	fc8a1bc349	doc: remove duplicated Salt Cloud AWS section on Termination Protection	2015-09-25 10:20:53 +02:00
rallytime	08c04da48b	Document tty: True usage in salt-ssh roster file ... Fixes #27354	2015-09-24 16:25:22 -06:00
Nicole Thomas	12a021da11	Merge pull request #27361 from cro/pxm_doc ... Correct some issues with proxy minions	2015-09-24 10:03:38 -06:00
Nicole Thomas	06047ebc5a	Merge pull request #27324 from alxbse/vmware-standalone-esxi ... Adds support for creating without cloning VMs in VMware driver	2015-09-24 08:52:18 -06:00
C. R. Oldham	928ef59a8a	Merge pull request #27349 from jfindlay/doc_typos ... add freebsd install docs to release notes	2015-09-24 07:51:02 -06:00
Alexander Backlund	759c8863d1	Merge branch 'vmware-standalone-esxi' of https://github.com/alxbse/salt into vmware-standalone-esxi ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py	2015-09-24 07:22:06 -04:00
C. R. Oldham	3a297d8036	Add release notes for proxy fixes.	2015-09-23 18:42:00 -06:00
Alexander Backlund	5367949e3b	Expand documentation on VMware driver to explain more about creating a VM. Add power_on support when creating.	2015-09-23 17:21:29 -04:00
Colton Myers	c4965e14ea	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/modules/yumpkg.py	2015-09-23 14:36:09 -06:00
rallytime	2bf566d934	Allow IP-forwarding in GCE driver ... Fixes #21390	2015-09-23 14:27:55 -06:00
rallytime	484015a7a3	Added version tag for ex_disk_type option	2015-09-23 14:21:17 -06:00
rallytime	a71ebc97b2	Allow use of rst header links by separating options out from yaml example ... Also added docs to use the ex_disk_type option	2015-09-23 14:21:06 -06:00
C. R. Oldham	f4944fe68a	Fix typo in docs	2015-09-23 14:11:00 -06:00
Justin Findlay	e509cfca17	fix typo in 2015.8.0 pull list	2015-09-23 14:03:12 -06:00
Justin Findlay	7137e731d3	add FreeBSD documentation to 2015.8.0 notes	2015-09-23 14:03:12 -06:00
alex	f418fa7c0e	Adds support for creating without cloning VMs. Makes it possible to manage standalone ESXi. ... Fixes saltstack/salt#26902	2015-09-23 15:06:03 -04:00
Alexander Backlund	be6921954e	Adds support for creating VMs without cloning. Makes it possible to manage standalone ESXi. ... Fixes saltstack/salt#26902	2015-09-23 07:06:25 -04:00
Colton Myers	ec6cd80496	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/man/salt.7 doc/ref/auth/all/index.rst doc/ref/auth/all/salt.auth.rest.rst doc/ref/beacons/all/index.rst doc/ref/beacons/all/salt.beacons.ps.rst doc/ref/pillar/all/index.rst doc/ref/pillar/all/salt.pillar.consul_pillar.rst doc/ref/pillar/all/salt.pillar.neutron.rst doc/ref/pillar/all/salt.pillar.sql_base.rst doc/ref/pillar/all/salt.pillar.sqlite3.rst doc/ref/sdb/all/salt.sdb.rest.rst salt/modules/rh_ip.py salt/utils/http.py	2015-09-22 15:31:46 -06:00
Colton Myers	95e70f0bef	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/config.py salt/minion.py salt/modules/yumpkg.py salt/runners/ssh.py salt/states/git.py salt/states/http.py	2015-09-22 15:20:17 -06:00
Colton Myers	7b75e4aed1	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-09-22 15:07:45 -06:00
rallytime	11a0a528a7	Make sure the VM can be deleted if it was created with use_fqdn	2015-09-22 11:45:27 -06:00
rallytime	9dcd11c155	Created a 'use_fqdn' flag to allow softlayer minion to use an FQDN as their minion id	2015-09-22 11:44:39 -06:00
rallytime	9b34542cb0	Filter on 'name', not 'id', when listing images ... And fix doc example of what --list-images looks like	2015-09-21 14:35:22 -06:00
Joseph Hall	b11ce6ac2a	Merge pull request #27251 from rallytime/fix-19947 ... Add support for post_uri in SoftLayer cloud drivers	2015-09-21 09:43:16 -06:00
Ben Hosmer	3ce77db1bc	Fix typo in AWS doc config	2015-09-21 09:36:46 -06:00
rallytime	aafb776808	Add support for post_uri in SoftLayer cloud drivers	2015-09-18 16:24:51 -06:00
Justin Findlay	3d28307a00	2014.7 -> 2014.7.0	2015-09-18 16:08:47 -06:00
Mike Place	115c1ed8ec	Merge pull request #27211 from whiteinge/local_batch-client ... Add local_subset client	2015-09-18 15:42:00 -06:00
Justin Findlay	c9255f2bbd	Merge pull request #27236 from basepi/merge-forward-develop ... Merge forward from 2015.8 to develop	2015-09-18 13:55:49 -06:00
Colton Myers	9864d9e0fa	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/ref/modules/all/index.rst doc/topics/releases/boron.rst salt/cli/daemons.py salt/cli/salt.py salt/modules/jboss7.py salt/states/file.py	2015-09-18 11:03:37 -06:00
Colton Myers	be2b0fc497	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/utils/http.py	2015-09-18 10:57:28 -06:00
Colton Myers	f4563ea9b7	Add stub release notes for 2015.5.6	2015-09-18 10:54:15 -06:00
Colton Myers	25410706ee	Add stub release notes for 2015.8.1	2015-09-18 10:51:54 -06:00
Ben Hosmer	5393751332	Fix typo in AWS doc config	2015-09-18 12:21:37 -04:00
Seth House	6be5745f61	Add local_subset client to docs	2015-09-17 18:03:04 -06:00
rallytime	cced6e9031	Don't repeat GCE setup instructions, and make the use of .json files clearer	2015-09-17 15:07:49 -06:00
Colton Myers	8c204a45ab	Merge pull request #27197 from basepi/merge-forward-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2015-09-17 13:53:22 -06:00
Colton Myers	26b6c92975	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/conf.py salt/config/__init__.py salt/modules/rh_ip.py salt/pillar/s3.py salt/returners/local_cache.py salt/states/user.py salt/templates/rh_ip/rh7_eth.jinja	2015-09-17 11:10:37 -06:00