rallytime
a959681858
Add link to Sending a GH PR to documentation docs
2015-11-03 14:07:49 -07:00
rallytime
1c612e2772
Update contributing and documentation pages to recommend submitting against branches
...
Fixes #28272
2015-11-03 10:44:29 -07:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
TheBigBear
2e5684a1e4
Update windows-package-manager.rst
2015-11-02 19:25:12 -06:00
Colton Myers
238411c8ce
Merge pull request #28464 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 13:18:21 -07:00
Mike Place
e31ef51053
Merge pull request #28493 from rallytime/bp-28492
...
Back-port #28492 to 2015.8
2015-11-02 10:54:09 -07:00
Mike Place
d19affd44d
Merge pull request #28491 from rallytime/bp-28388
...
Back-port #28388 to 2015.8
2015-11-02 10:13:22 -07:00
Christer Edwards
ffc77259c9
Updated FreeBSD installation docs:
...
- fixed URL in description
- set https in all URLs
2015-11-02 11:31:23 -05:00
Mike Place
04585a2878
Documentation for disable_during_state_run
2015-11-02 11:00:33 -05:00
Colton Myers
3286a5250f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/pillar.rst
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/file.py
salt/modules/schedule.py
salt/pillar/git_pillar.py
salt/states/boto_route53.py
salt/states/pkg.py
tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
Sam Michel
b968581eb1
Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
...
See #28453
2015-10-30 12:41:00 -07:00
Gary Waters
e70990704a
added a note to the tutorial for those that redhat so they can use the state file too.
2015-10-30 09:47:46 -07:00
rallytime
8e3a2ba7e7
Add note about azure sdk version to getting started docs
2015-10-29 15:30:37 -04:00
twangboy
f65e3e5275
Updated documentation to reflect the new parameter
2015-10-27 15:56:53 -06:00
Gary Waters
b15285c0b4
adding a working example of setting pillar data on the cli
2015-10-26 14:22:38 -07:00
sdm24
02cac9d8c0
Update nodegroups.rst
...
cleaned up text lines that were too long
2015-10-26 11:31:57 -07:00
sdm24
b2c3307c2e
Update nodegroups.rst
...
fixed more formatting
2015-10-26 11:20:34 -07:00
sdm24
e79a930f57
updated nodegroups.rst
...
fixed formatting issues
2015-10-26 11:19:48 -07:00
Sam Michel
f2a6bc94df
Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja
...
See issue #28268
2015-10-26 11:11:01 -07:00
Mike Place
499ed8519b
Minor grammar changes to #28271
2015-10-26 06:15:19 -06:00
Mike Place
e178af0b90
Merge pull request #28271 from gwaters/update-tutorial-documentation
...
Update tutorial documentation
2015-10-26 06:12:37 -06:00
Florian Ermisch
6d4316b0ac
Correct Jinja function load_* to import_*
...
Fixes #28248 .
Also added a YAML example because really, who wants to write json by hand? ;)
Don't know if this is mentioned in the pillar docs but would be very useful there, too.
2015-10-24 12:13:37 +02:00
Gary Waters
f96d39483d
updated the tutorial with gravyboat's suggestions
2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4
i think i changed the wrong header, updated to fix
2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1
I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had.
2015-10-23 15:34:31 -07:00
rallytime
8b06ab4335
Add documentation to supply the ssh_username: freebsd config to DO docs
...
Fixes #28230
2015-10-22 15:24:39 -06:00
Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Colton Myers
c4c889f97b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
salt/daemons/masterapi.py
salt/minion.py
2015-10-20 14:47:49 -06:00
Nicole Thomas
53dd01fc24
Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change
...
Add clarification to cloud profile doc about host
2015-10-20 13:46:05 -06:00
Aditya Kulkarni
bc371c55cd
Add clarification to cloud profile doc about host
2015-10-20 15:17:47 -04:00
Mike Place
572487073c
Merge pull request #28096 from rallytime/bp-28061
...
Back-port #28061 to 2015.8
2015-10-20 10:15:34 -06:00
rallytime
458a544d83
Add OpenBSD installation documentation to 2015.5 branch
2015-10-20 09:13:28 -06:00
Antoine Jacoutot
bc9159a126
OpenBSD salt package: update list of dependencies.
2015-10-20 09:07:43 -06:00
C. R. Oldham
1085eeab2b
Merge pull request #27922 from cro/fx2
...
WIP States/Modules for managing Dell FX2 chassis via salt-proxy
2015-10-19 17:29:21 -06:00
C. R. Oldham
3712066fc9
More docs.
2015-10-19 13:19:20 -06:00
Aditya Kulkarni
7c8f236115
Add documentation for proxy minion ssh
2015-10-19 13:30:35 -04:00
Michael Vogel
cb8a72d580
Fix #28060
...
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
2015-10-19 09:54:12 -06:00
Mike Place
1db6406bef
Merge pull request #28013 from rallytime/bp-27891
...
Back-port #27891 to 2015.8
2015-10-19 06:57:51 -06:00
Mike Place
26b3e01dda
Merge pull request #28018 from rallytime/fix-27938
...
Add example to Writing Grains of how grains can be loaded twice
2015-10-19 06:47:10 -06:00
C. R. Oldham
4ce2f8bb11
Documentation.
2015-10-16 16:52:14 -06:00
Justin Findlay
ae92a8a1dc
fix repo path in ubuntu installation documentation
...
Fixes #28038 .
2015-10-16 13:29:18 -06:00
Jacob Hammons
05927bb6f0
Updated release notes with additional CVE information
2015-10-16 10:18:42 -06:00
Jacob Hammons
0d1b691549
Updated release notes with additional CVE information
2015-10-16 10:12:12 -06:00
Jacob Hammons
e4d7df8695
Updated Debian and Ubuntu repo paths with new structure for 2015.8.1
2015-10-16 09:22:48 -06:00
rallytime
c23af0d8e2
Clarify loading vs rendering the final grains data structure
2015-10-16 06:43:24 -06:00
rallytime
a4d7fb7e60
Add example to Writing Grains of how grains can be loaded twice
...
Fixes #27938
2015-10-16 06:26:59 -06:00
Domingo Kiser
4af5b5c33f
introduce recurse_list pillar_source_merging_strategy
2015-10-16 05:24:40 -06:00
Jacob Hammons
2870af2ba3
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:05:35 -06:00
Jacob Hammons
bb61c68c11
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be
Changed current release to 8.1 and added CVEs to release notes
2015-10-15 11:14:50 -06:00
rallytime
13a9bc9053
Use eipalloc instead of eni in EC2 interface properties example
...
Fixes #27815
2015-10-13 14:46:01 -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
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
Justin Findlay
03400ef45b
fix virtual fcn return doc indentation
...
Fixes #27724 .
2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491
Merge pull request #27732 from jacobhammons/26673
...
update docs for __virtual__ and __virtualname__
2015-10-07 11:29:31 -06:00
Jacob Hammons
75cc07cf10
noted that __virtual__ can return False and an error string
2015-10-07 09:48:46 -06:00
Jacob Hammons
3a52d3606b
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:38:49 -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
b928e1afa8
update docs for __virtual__ and __virtualname__
...
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546
update __virtual__ return documentation
...
Related to #26755 ; fixes #27116 ; implements part of #27643 .
2015-10-06 13:47:31 -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
avinassh
bfa0acfbfe
Fix a typo
2015-10-05 08:58:51 -06: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
Mike Place
eb59cb8d1c
Merge pull request #27614 from blueyed/doc-minor
...
doc: minor fixes to doc and comments
2015-10-02 09:34:02 -06:00
Jacob Hammons
1c8b32ce26
Updated windows software repository docs
2015-10-01 22:02:01 -06:00
Daniel Hahler
98a8c0f055
doc: minor fixes to doc and comments
2015-10-02 01:18:32 +02: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
Mike Place
c84a1edc1b
Merge pull request #27568 from jacobhammons/man-pages-five
...
regenerated man pages
2015-10-01 09:39:37 -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
Jacob Hammons
b59c03d20d
regenerated man pages
2015-09-30 13:32:58 -06:00
Jacob Hammons
cc37dc1087
updated version in salt.7
2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13
regenerated man pages for 2015.8.1
2015-09-30 12:58:34 -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
1f7ea7c764
Merge pull request #27517 from jacobhammons/install-docs
...
Updated install docs
2015-09-30 09:19:51 -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
931f593b51
Merge pull request #27483 from rallytime/fix-17103
...
Outputters should sync to output, not outputters, on the minion.
2015-09-29 09:33:08 -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
rallytime
105528720b
Outputters should sync to output, not outputters, on the minion.
...
Otherwise, the loader won't pick them up.
Fixes #17103
2015-09-28 16:53:53 -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
twangboy
a996ea46e2
Added quotes to version numbers example
...
Fixes #27433
2015-09-28 12:52:59 -06:00
Joseph Hall
5dd1b70475
Merge pull request #27408 from rallytime/fix-27406-for-2015.5
...
Fix avail_locations function for the softlayer_hw driver in 2015.5
2015-09-25 17:34:50 -06: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
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
Jacob Hammons
a9fdecada1
Fix css layout Refs #27389
...
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
Meggie Woodfield
1c779700f6
Adding stretch label definition
2015-09-25 10:59:07 -06: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
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
C. R. Oldham
3a297d8036
Add release notes for proxy fixes.
2015-09-23 18:42:00 -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
rallytime
1d3925bbfb
Added version tag for ex_disk_type option
2015-09-23 13:08:18 -06:00
rallytime
f23369300c
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 13:06:25 -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
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
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
Justin Findlay
3d28307a00
2014.7 -> 2014.7.0
2015-09-18 16:08:47 -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
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
2c2a5f85ac
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/gce.rst
salt/cli/api.py
salt/cli/call.py
salt/cli/cp.py
salt/cli/key.py
salt/cli/run.py
salt/cli/salt.py
salt/modules/dockerio.py
salt/states/dockerio.py
2015-09-17 10:54:33 -06:00
Jacob Hammons
e56f02b025
re-add cheatsheet do-over
2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561
re-added cheatsheet.tex
2015-09-17 09:29:09 -06:00
Jacob Hammons
f7a9e25d52
Fixed sphinx / latex build warnings and errors
...
Added missing modules to contents
2015-09-17 09:23:24 -06:00
rallytime
531b44243d
Remove note - incorrect info
2015-09-16 19:30:03 -06:00
rallytime
fe74d203f5
Add the ability to specify multiple disks on the SoftLayer driver
...
Refs #19954
2015-09-16 16:46:02 -06:00
rallytime
a07db909bd
Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
2015-09-16 12:51:47 -06:00
Jacob Hammons
7ed9f6260f
Updated key instruction on rhel7
2015-09-15 10:04:57 -06:00
Jacob Hammons
d1e8af9be6
added command to remove key from rhel6
2015-09-15 06:33:08 -06:00
Jacob Hammons
69d64f177d
moved rhel5 commands to separate lines
2015-09-15 06:30:45 -06:00
Jacob Hammons
90431278ea
Install instruction updates for rhel6 and debian
2015-09-15 06:29:09 -06:00
Justin Findlay
fc8afcc9f9
Merge pull request #27124 from jfindlay/bp-27123
...
Backport #27123
2015-09-15 02:37:43 -06:00
Justin Findlay
0d62d3470c
Merge pull request #27111 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-15 01:29:30 -06:00
Christer Edwards
016fb5fafe
Update freebsd.rst
...
fix URL, typ in saltstack repo config
2015-09-15 01:27:14 -06:00
Christer Edwards
026fc9a884
update for freebsd installation documentation
2015-09-15 01:27:14 -06:00
Jacob Hammons
b69e11e0a4
made 2014.7 an archived release
...
minor doc site updates
2015-09-14 16:43:51 -06:00
Jacob Hammons
6e323b6dd3
Update latest to 2015.8, 2015.5 is now previous
...
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Jacob Hammons
42eaa80997
Restored missing css
2015-09-14 16:00:06 -06:00
Jacob Hammons
9ab642295e
Fixed a release notes typo and bad file rename
2015-09-14 15:51:37 -06:00
Jacob Hammons
daa3f4eee0
Updated release notes, change 2015.8 to latest release for doc site
2015-09-14 15:17:59 -06:00
Jacob Hammons
d939a38c8c
release notes updates
2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/reactor/index.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/groupadd.py
salt/modules/localemod.py
salt/modules/mysql.py
salt/modules/useradd.py
salt/modules/win_pkg.py
salt/modules/win_useradd.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/htpasswd.py
salt/states/user.py
2015-09-14 14:39:03 -06:00
Joseph Hall
ee0c8955dd
Document develoment of SPM loader modules
2015-09-12 11:14:47 -06:00
Arnold Bechtoldt
b9e5095bf5
add GH issue label SPM to docs
2015-09-12 11:14:26 +02:00
rallytime
76c056d02b
Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released
2015-09-11 16:05:28 -06:00
rallytime
cb641f8145
Update softlayer docs for where to find apikey
2015-09-10 16:23:47 -06:00
Nicole Thomas
37814f5dff
Merge pull request #26996 from jacobhammons/beacon-doc
...
Beacon doc updates
2015-09-10 10:47:49 -06:00
Jacob Hammons
e475ea688e
Fixed typo
2015-09-09 13:41:48 -06:00
Nicole Thomas
3e902e86b1
Merge pull request #26987 from rallytime/bp-26966
...
Back-port #26966 to 2015.5
2015-09-09 12:42:51 -06:00
Justin Findlay
9aaca9338e
generate pull request list v2015.8..v2015.8.0
...
Also remove the changelogs generated for rc2 and rc3 in favor of a
unified list that shows all merged pull requests between the forking of
the 2015.8 branch and the release of 2015.8.0.
2015-09-09 12:41:09 -06:00
Jacob Hammons
2401533d9e
New content added to beacon docs.
2015-09-09 11:16:55 -06:00
David Boucha
308d9b1408
Merge pull request #26980 from terminalmage/winrepo-unique-name
...
Use human-readable cachedirs for gitfs-backed winrepo
2015-09-09 11:02:13 -05:00
TheBigBear
6a29eac003
URL has changed
...
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-09 08:59:19 -06:00
Erik Johnson
415c001a38
Add link to winrepo.update_git_repos runner function for consistency.
2015-09-09 09:04:52 -05:00
Erik Johnson
1dd77e7003
Fix misspelled word
2015-09-09 09:02:55 -05:00
Erik Johnson
d05e7b0875
Add information on winrepo cachedir name overrides
2015-09-09 05:44:15 -05:00
Erik Johnson
a45bb90230
Remove block describing hashed winrepo cachedirs
...
The behavior has now changed so this information is inaccurate.
2015-09-09 05:44:15 -05:00
rallytime
0214daad19
Fix a couple of typos in reactor docs
2015-09-08 14:52:38 -06:00
TheBigBear
21ea2f6b1b
URL of salt windows downloads has changed
2015-09-08 21:43:59 +01:00
Pedro Algarvio
28069faffb
Remove the /etc/salt prefix
...
Closes #26890
2015-09-08 17:26:48 +01:00
Pedro Algarvio
c586e43f63
Merge branch 'bootstrap-command-line-help-doc-update' of https://github.com/bradthurber/salt into bradthurber-bootstrap-command-line-help-doc-update
2015-09-08 17:13:47 +01:00
rallytime
00fe6a225c
Fix minor doc typo in client api
2015-09-07 12:55:39 -06:00
Brad Thurber
0004bf803f
salt bootstrap tutorial docs are out-of-date compared with the actual utility help (-h)
2015-09-03 14:20:04 -04:00
Jacob Hammons
ac3bd47440
states/pkgrepo examples, suse installation updates
...
Refs #26644
Refs #26638
2015-09-02 11:37:40 -06:00
Jacob Hammons
701f47a658
Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py
...
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
2015-09-01 17:09:35 -06:00
Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
5cca52a3c1
Fixed windows installer paths
...
Refs #25567
2015-08-31 20:20:44 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
992edc3bb8
Doc bug fixes
...
Refs #26192
Refs #26638
Refs #26644
Refs #26108
2015-08-31 16:05:50 -06:00
Jacob Hammons
06ac3bed42
Fixed typo
2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543
Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
...
Refs #21214
2015-08-31 13:51:31 -06:00
rallytime
d53754f2b7
Update Saltify docs to be more accurate and helpful
2015-08-31 12:02:23 -06:00
C. R. Oldham
65ae57310c
Fix typo in some draw object labels
2015-08-28 12:49:16 -06:00
Joseph Hall
116e345cb0
Document top_level_dir
2015-08-27 14:57:25 -06:00
Joseph Hall
f4723efe68
Add SPM paths into mainline Salt configs
2015-08-27 12:21:53 -06:00
Colton Myers
735aa8eb5e
Merge pull request #26684 from techhat/spmreactor
...
Add reactor formulas to spm
2015-08-26 16:45:47 -06:00
Joseph Hall
2eef80414a
Document reactor packages
2015-08-26 14:59:01 -06:00
Colton Myers
ef76404def
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/releases/2015.5.5.rst
2015-08-26 14:32:03 -06:00
Colton Myers
40718af1d5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
doc/conf.py
salt/modules/win_service.py
tests/integration/cloud/providers/digital_ocean.py
2015-08-26 14:29:57 -06:00
Colton Myers
09d0602d04
Merge pull request #26674 from rallytime/bp-26583
...
Back-port #26583 to 2015.8
2015-08-26 13:01:47 -06:00
Joseph Hall
e4dcef5048
Document SPM package types
2015-08-26 12:21:28 -06:00
Jeremy Rosenbaum
763ee20713
documentation for zip archive modules
2015-08-26 12:18:57 -06:00
Mike Place
d129bf4961
Merge pull request #26657 from jfindlay/top_lint
...
top file compilation fixes
2015-08-26 10:00:34 -06:00
Jacob Hammons
b6af538070
version change for latest branch
2015-08-26 08:02:54 -06:00
jacobhammons
a04d243471
Merge pull request #26662 from jacobhammons/version
...
update version to 2015.5
2015-08-26 07:45:44 -06:00
Jacob Hammons
4e5766fdde
update version to 2015.5
2015-08-26 07:45:08 -06:00
TheBigBear
1d5395b27a
minor doc edits - spelling
2015-08-26 12:11:50 +01:00
Justin Findlay
1d404bd561
remove trailing whitespace in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2
change md code quoting to rst in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6
add default_top description to docs
2015-08-26 01:44:33 -06:00
Justin Findlay
dc5cee5f8f
add 2015.5.4 notes to 2015.5.5 notes
2015-08-25 16:52:13 -06:00
Jacob Hammons
fefd7aa7e8
2015.8.0 release notes and doc/conf.py updates
2015-08-25 15:12:20 -06:00
twangboy
020b20ec41
Correctly detect packages with no version, docs
2015-08-24 17:52:30 -06:00
David Boucha
5522d87a11
Merge pull request #26603 from terminalmage/issue13550
...
Fixes for git.latest, git module integration tests, etc.
2015-08-24 16:47:16 -05:00
Erik Johnson
33ea02b9d0
Add information on new arguments to release notes
...
Also tweaked the wording and formatting for consistency.
2015-08-23 22:36:48 -05:00
Pedro Algarvio
2f9b40ca25
Merge pull request #26577 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-23 08:14:04 +01:00
Pedro Algarvio
016e350c0f
Merge pull request #26541 from terminalmage/masterless-winrepo
...
Make winrepo execution module use the same code as the runner
2015-08-22 22:47:31 +01:00
Colton Myers
667dfcee14
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/renderers/gpg.py
tests/integration/loader/loader.py
2015-08-21 16:44:59 -06:00
Colton Myers
55ecff1278
Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8
...
Conflicts:
salt/utils/event.py
2015-08-21 16:37:24 -06:00
Justin Findlay
7e67e48656
Merge pull request #26552 from rallytime/bp-26542
...
Back-port #26542 to 2015.5
2015-08-21 11:40:11 -06:00
Arthur Lutz
0976b1e23b
[doc] reactor documentation fix : returners
2015-08-21 09:46:04 -06:00
Calle Pettersson
94ff4cff40
Doc-fix: Escape backslash in domain\username
...
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
2015-08-21 09:44:20 -06:00
Erik Johnson
d2166e95cb
Fix formatting
2015-08-21 10:19:36 -05:00
Erik Johnson
9852bedda2
Tweak wording a bit
2015-08-21 03:04:41 -05:00
Erik Johnson
74d1256338
Update release notes
2015-08-21 02:39:34 -05:00
Erik Johnson
fff709da81
Add a bunch more documentation for winrepo
2015-08-21 02:39:34 -05:00
Erik Johnson
b04bc228d0
Correct some inaccurate documentation, fix formatting
2015-08-21 02:38:12 -05:00
Erik Johnson
fb46a6cbda
Rename ref anchor
2015-08-21 02:38:12 -05:00
Justin Findlay
2fee5708bb
Merge pull request #26501 from terminalmage/git_pillar_docs
...
Update git_pillar docs, add git.list_worktrees function
2015-08-20 23:34:02 -06:00
Colton Myers
2907a64052
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cli/batch.py
salt/modules/git.py
salt/utils/event.py
2015-08-20 13:31:46 -06:00
C. R. Oldham
e2c70ac55d
Merge pull request #26433 from cro/pm_20158_2
...
Add support for default proxy config options, change default location of proxy config and log to /etc/salt/proxy and /var/log/proxy
2015-08-20 11:14:13 -06:00
Justin Findlay
612e342c70
autogenerated 2015.5.5 release notes
2015-08-20 11:08:56 -06:00
Nicole Thomas
ade934f06e
Merge pull request #26504 from nmadhok/vmware-hardware-version-2015.8
...
[Backport] Adding ability to specify the virtual hardware version when creating VM
2015-08-20 10:55:40 -06:00
Joseph Hall
fe3d0e8dc5
Merge pull request #26479 from rallytime/ec2_force_rename
...
Don't allow VMs with duplicate names to be created in EC2/AWS
2015-08-20 08:36:39 -06:00
Nitin Madhok
dca4d601d5
Adding ability to specify the virtual hardware version when creating VM
2015-08-19 21:17:22 -04:00
Erik Johnson
817078096f
Fix invalid :py:func: paths
...
These are functions from the execution module, not the state module.
2015-08-19 19:10:17 -05:00
C. R. Oldham
aace656a37
Fix bad url.
2015-08-19 16:38:30 -06:00
Jacob Hammons
2a85d71c25
doc site css fix for tiny fonts that appeared in code or pre tags in headings
2015-08-19 14:32:55 -06:00
Erik Johnson
a4b7457683
Add information re: git state/module rewrite
...
Also improve the git_pillar information
2015-08-19 15:25:07 -05:00
Erik Johnson
dbeffe4944
Point git_pillar reference in winrepo documentation at a valid ref
2015-08-19 15:24:30 -05:00
Erik Johnson
ee1eac925a
Point git_pillar section in gitfs tutorial at git_pillar docstring
2015-08-19 15:23:52 -05:00
Jacob Hammons
499bd66378
Minor doc bug fixes
...
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
2015-08-19 11:31:26 -06:00
rallytime
d44a75d7c0
Don't allow VMs with duplicate names to be created in EC2/AWS
...
Even if the VM is in the terminated state, from salt-cloud's perspective,
there should never be duplicately named instances.
This PR also changes the ``rename_on_destroy`` config default to True to
avoid errors and move the old ones out of the way if you forget to set it
in your cloud config.
2015-08-19 11:30:12 -06:00
Colton Myers
e57f767244
Merge pull request #26439 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-19 10:39:04 -06:00
Arthur Lutz
4ce50ad5bf
[doc] topology / proxyminions fix typos
2015-08-19 08:44:46 -06:00
C. R. Oldham
7213fbfed4
Add end-to-end walkthrough
2015-08-18 14:43:26 -06:00
Mike Place
d8ffb1c4c0
Merge pull request #26436 from TheBigBear/patch-10
...
minor edits
2015-08-18 14:23:36 -06:00
C. R. Oldham
10b7eddf0b
Update diagrams for docs.
2015-08-18 12:43:17 -06:00
Colton Myers
c08668ecf1
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/fileserver/gitfs.py
salt/master.py
salt/pillar/s3.py
2015-08-18 12:13:05 -06:00
Colton Myers
f6481a1fb3
Merge pull request #26410 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-18 11:52:13 -06:00
TheBigBear
e57dc520f6
minor edits
...
lowercasing firefox as it's sls pkg name has been lowercased,
and fix one typo reops -> repos
2015-08-18 18:11:44 +01:00
Nicole Thomas
96b8c1fe82
Merge pull request #26428 from cro/pm_20158_2
...
Update docs to reflect new pillar structure
2015-08-18 09:32:23 -06:00
scottjpack
0254a2e90e
Changed t1 -> t2 micro
...
t1.micro no longer supports HVM AMIs. Attempted launch with a t1.micro results in:
[ERROR ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
2015-08-18 09:22:57 -06:00
Mike Place
983619f1f6
Merge pull request #26429 from cachedout/tcp_freebsd_warn
...
Add release note regarding tcp transport on freebsd
2015-08-18 09:06:47 -06:00
Mike Place
fa88b7d35c
Add release note regarding tcp transport on freebsd
...
Refs #26364
2015-08-18 09:06:13 -06:00
C. R. Oldham
b5a4a53062
Update documentation to reflect new pillar structure.
2015-08-18 09:03:23 -06:00
Mike Place
afec85caff
Merge pull request #26422 from TheBigBear/patch-9
...
no dots in SLS filename __AND__ any directories (incl git repos)
2015-08-18 08:09:15 -06:00
TheBigBear
b5e73f033d
no dots in SLS filename __AND__ any directories (incl git repos)
...
also see https://github.com/saltstack/salt/issues/26264 and https://github.com/saltstack/salt/issues/26158
2015-08-18 12:31:49 +01:00
Colton Myers
d3d0e004d9
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/minion.py
salt/modules/gpg.py
salt/modules/keystone.py
salt/modules/pw_user.py
salt/states/reg.py
setup.py
2015-08-17 16:54:16 -06:00
Erik Johnson
56fc78de80
Hide aliased funcs from docs
2015-08-17 17:29:13 -05:00
TheBigBear
8898d64918
dependency zip files moved to new site
2015-08-17 22:01:50 +01:00
