Commit Graph

5059 Commits

Author SHA1 Message Date
Nicole Thomas
c70a576fe8 Merge pull request #27659 from gnubyexample/develop
.pub as public key is what we should send to remote
2015-10-05 11:08:20 -06:00
avinassh
e265ba8592 Fix a typo 2015-10-05 19:21:16 +05:30
Gary Wright
00baf21176 .pub as public key is what we should send to remote 2015-10-03 23:01:19 +01:00
Stephen Medina
afcc12bc9b fix typo in default pillar path
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
2015-10-02 14:25:48 -07:00
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
Seth House
64b54e668a Add fake pymongo version attribute for the docs
This bypasses the following traceback when building the docs.

File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
    version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
2015-09-28 13:51:31 -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
97e69ebb97 doc: fix state's top documentation typo 2015-09-25 12:16:48 -06: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
c4e7392a2b doc: fix state's top documentation typo 2015-09-25 10:36:27 +02: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
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -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
Justin Findlay
9061cccc4a Merge pull request #27280 from snarfmonkey/develop
minion log_level default is 'info' not 'warning'
2015-09-21 13:27:32 -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
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00
Justin Findlay
1a32b9f778 Merge pull request #27254 from jfindlay/version.2015.8
2015.2,2015.8,Beryllium -> 2015.8.0
2015-09-18 17:44:46 -06:00
Justin Findlay
8ea15f498e 2015.2,2015.8,Beryllium -> 2015.8.0
Some features were erroneously reported as being added in 2015.2.
2015-09-18 16:35:15 -06:00
rallytime
aafb776808 Add support for post_uri in SoftLayer cloud drivers 2015-09-18 16:24:51 -06:00