Colton Myers
6537da77fe
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/grains/core.py
salt/loader.py
salt/minion.py
salt/modules/dockerng.py
salt/modules/rest_package.py
salt/modules/ssh.py
salt/modules/state.py
salt/modules/timezone.py
salt/modules/zypper.py
salt/runners/state.py
salt/state.py
salt/states/virtualenv_mod.py
salt/utils/cloud.py
2015-10-13 17:27:48 -06:00
Mike Place
dd92b8a2e3
Merge pull request #27874 from rallytime/deprecation-docs
...
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-13 08:51:45 -06:00
C. R. Oldham
5b33df9d19
Add docs for 2015.8.2+ changes
2015-10-12 14:55:19 -06:00
rallytime
8c056ba501
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-12 13:08:50 -06:00
Steve Hajducko
5ff8a83009
Clarify argument usage for runners in reactors
...
Clarified that positional arguments don't work in runners currently and
that you must use keyword args. Fixes #27770
Also, modified the link to point at the function the example shows,
rather than the previous example.
2015-10-09 21:22:54 -07:00
Colton Myers
9128e8e7ae
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
2015-10-07 13:14:28 -06:00
Colton Myers
69d960f8e6
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
2015-10-07 13:11:48 -06:00
Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
Jacob Hammons
117e0c2bcc
Added hardening topic based on the information in Refs #27088
2015-10-06 17:36:54 -06:00
Jacob Hammons
76dc8de71b
Assorted doc bugs
...
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Jacob Hammons
1c51ce28a9
Update compound matcher docs to clarify the usage of alternate delimiters
...
Refs #26604
2015-10-05 17:29:39 -06:00
Jacob Hammons
5a3e72fc8e
__ops__ to __opts__
2015-10-05 15:00:56 -06:00
Jacob Hammons
5a9867aad1
initial engines topic, updates to windows repo docs
...
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Gary Wright
84b6ee0c58
.pub as public key is what we should send to remote
2015-10-05 11:40:55 -06:00
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
bfa0acfbfe
Fix a typo
2015-10-05 08:58:51 -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
a9063a9745
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 16:50:28 -06: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
Jacob Hammons
1c8b32ce26
Updated windows software repository docs
2015-10-01 22:02:01 -06:00
rallytime
8dc047dc18
If external_up is set to None, don't stacktrace, just use the private ip.
2015-10-01 16:37:17 -06:00
Justin Findlay
f2eb20f26b
add autogenerated 2015.8.1 release notes
2015-09-30 22:51:36 -06:00
Jacob Hammons
ee4a3b3549
added changes list for 2015.8.1
2015-09-30 16:58:53 -06:00
Justin Findlay
4f0d55cda6
add 2015.5.6 release notes
2015-09-30 16:29:57 -06:00
Justin Findlay
3727d79bad
edit mine doc for style and markup
2015-09-30 11:40:22 -06:00
Justin Findlay
7e037a4666
add doc motivating mine vs grains
...
Fixes #27518 .
2015-09-30 11:40:22 -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
Mike Place
1f7ea7c764
Merge pull request #27517 from jacobhammons/install-docs
...
Updated install docs
2015-09-30 09:19:51 -06: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
Colton Myers
73b90f155e
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e
Fixed a duplicated link ID
2015-09-29 14:08:48 -06:00
Jacob Hammons
c05fa71f91
Updated install docs
...
Refs #27281
Refs #27179
2015-09-29 12:07:50 -06:00
Mike Place
9c2c028953
Merge pull request #27484 from rallytime/bp-27434-and-27470
...
Back-port #27434 and #27470 to 2015.5
2015-09-29 09:32:03 -06:00
Mike Place
5de2ee35ab
Minor doc fixup.
...
Language and grammar changes.
2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87
Doc: copy key to server via ssh-copy-id
...
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-28 17:19:09 -06:00
Mike Place
a49cdab950
Minor doc fixup.
...
Language and grammar changes.
2015-09-28 13:11:58 -06:00
twangboy
a996ea46e2
Added quotes to version numbers example
...
Fixes #27433
2015-09-28 12:52:59 -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
rallytime
39a4ae5a6c
Remove hdd: 19 refs from SL docs - no longer available from SoftLayer.
2015-09-25 12:54:25 -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
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
