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