Christer Edwards
d55f3f79cb
Update freebsd.rst
...
fix URL, typ in saltstack repo config
2015-09-14 21:44:44 -06:00
Christer Edwards
ab53cd2970
update for freebsd installation documentation
2015-09-14 21:34:35 -06:00
Colton Myers
896313bff0
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/pillar/s3.py
2015-09-14 15:01:41 -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
a0de117a0f
Merge branch '2015.8' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/config/__init__.py
2015-09-11 09:33:21 -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
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
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
TheBigBear
21ea2f6b1b
URL of salt windows downloads has changed
2015-09-08 21:43:59 +01:00
TheBigBear
c1e39a15d7
URL has changed
...
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-08 21:21:17 +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
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -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
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
Colton Myers
278e8dda5b
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
2015-09-01 15:15:13 -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
Colton Myers
1bbe45538e
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/__init__.py
salt/modules/smartos_vmadm.py
salt/utils/s3.py
setup.py
2015-08-28 16:44:08 -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
76c70162db
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
doc/topics/spm/index.rst
salt/cloud/clouds/gce.py
salt/cloud/clouds/opennebula.py
salt/cloud/clouds/openstack.py
tests/unit/states/file_test.py
2015-08-26 14:47:33 -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
905a045b8d
update version for latest stable
2015-08-26 08:18:36 -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
Colton Myers
9159800ce8
Merge pull request #26583 from jodv/zip_modules
...
Using .zip archives as self-contained Salt modules
2015-08-25 15:33:10 -06:00
