Colton Myers
|
7dfbd929ff
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
2015-05-26 15:51:15 -06:00 |
|
Justin Findlay
|
67c4373577
|
Merge pull request #24135 from rallytime/bp-24083
Backport #24083 to 2015.5
|
2015-05-26 09:58:27 -06:00 |
|
thanhnt
|
e1d06f9764
|
fix code block syntax
|
2015-05-26 08:57:46 -06:00 |
|
Justin Findlay
|
fa2d411f53
|
update example release branch in contrib docs
|
2015-05-25 23:06:39 -06:00 |
|
Justin Findlay
|
a0b76b57b3
|
clarify git rebase instructions
|
2015-05-25 23:05:23 -06:00 |
|
Justin Findlay
|
3517e0095f
|
fix contribution docs link typos
|
2015-05-25 22:55:19 -06:00 |
|
Justin Findlay
|
651629c6a4
|
backport dev contrib doc updates to 2015.5
|
2015-05-25 22:54:54 -06:00 |
|
rallytime
|
113c6049f5
|
Update release note for 2015.5.1
|
2015-05-20 14:50:08 -06:00 |
|
Justin Findlay
|
1aa0420040
|
Merge pull request #23933 from jacobhammons/2014.7
sphinx saltstack2 doc theme
|
2015-05-20 12:19:19 -06:00 |
|
David Boucha
|
10338d0c54
|
Add links to Windows 2015.5.0-2 install downloads
|
2015-05-20 11:16:24 -06:00 |
|
David Boucha
|
b84f9756c5
|
updated Windows 2014.7.5-2 installer download link
|
2015-05-20 11:16:24 -06:00 |
|
Thomas S Hatch
|
63164900bd
|
Merge pull request #23942 from jacobhammons/2015.5
Updates to sphinx saltstack2 doc theme
|
2015-05-20 09:43:54 -06:00 |
|
Jacob Hammons
|
31023c8915
|
Updates to sphinx saltstack2 doc theme
|
2015-05-19 15:54:28 -06:00 |
|
Jacob Hammons
|
a3613e68e4
|
removed numbering from doc TOC
|
2015-05-19 15:35:16 -06:00 |
|
Colton Myers
|
36f0065faf
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
salt/client/ssh/wrapper/pillar.py
|
2015-05-19 15:23:37 -06:00 |
|
Colton Myers
|
32b65dc2a9
|
Add extended changelog to 2014.7.6 release notes
|
2015-05-19 15:18:29 -06:00 |
|
Jacob Hammons
|
78b737c5e6
|
removed 2015.* release from release notes, updated index page to remove PDF/epub links
|
2015-05-19 13:53:31 -06:00 |
|
Jacob Hammons
|
e867f7df77
|
Changed build settings to use saltstack2 theme and update release versions.
|
2015-05-19 13:44:00 -06:00 |
|
Jacob Hammons
|
81ed9c9f59
|
sphinx saltstack2 doc theme
|
2015-05-19 13:36:57 -06:00 |
|
Mathieu Le Marec - Pasquet
|
80eabe2703
|
lxc salt cloud doc
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
|
2015-05-19 20:27:55 +02:00 |
|
jpic
|
a4bcd75171
|
Fixed wrong path in LXC cloud documentation
|
2015-05-19 18:54:07 +02:00 |
|
Jacob Hammons
|
f7eb70ca60
|
changed previous release to 2014.7.6
|
2015-05-18 17:40:50 -06:00 |
|
Jacob Hammons
|
a56697bd6e
|
Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
|
2015-05-18 17:11:29 -06:00 |
|
Colton Myers
|
c2eed77691
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
2015-05-18 17:07:15 -06:00 |
|
Colton Myers
|
dec153bcea
|
Update the release notes index page
|
2015-05-18 17:06:27 -06:00 |
|
Colton Myers
|
49921b6cb2
|
Update the 2014.7.6 release notes with CVE details
|
2015-05-18 16:34:48 -06:00 |
|
dumol
|
379c09c3a5
|
Updated for SLES 12.
Added updated instructions for latest SLES release, using the relevant repo.
|
2015-05-18 13:11:42 -06:00 |
|
Jacob Hammons
|
46eb2655ee
|
saltstack2 sphinx theme updates
|
2015-05-17 20:39:24 -06:00 |
|
Jacob Hammons
|
e7442d3b1e
|
Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
|
2015-05-17 20:38:45 -06:00 |
|
Jacob Hammons
|
ee3c1bd4a7
|
missed one
|
2015-05-15 16:26:47 -06:00 |
|
Jacob Hammons
|
3872921dd0
|
More updates to sphinx2 theme
|
2015-05-15 16:26:11 -06:00 |
|
Justin Findlay
|
94f9099307
|
Merge pull request #23723 from rallytime/bp-23568
Backport #23568 to 2015.5
|
2015-05-14 13:34:11 -06:00 |
|
Joseph Hall
|
bbec34abd3
|
Allow Salt Cloud to use either SCP or SFTP, as configured
|
2015-05-14 10:49:20 -06:00 |
|
Colton Myers
|
06a3ebd9d1
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
2015-05-14 10:13:40 -06:00 |
|
Jacob Hammons
|
8c32152be0
|
removed TOC numbering, additional tweaks to layout.html
|
2015-05-13 21:18:00 -06:00 |
|
Jacob Hammons
|
73dfaeff28
|
Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5
|
2015-05-13 21:16:36 -06:00 |
|
Mike Place
|
bdbbfa6ee7
|
Start on 2015.5.1 release notes
|
2015-05-13 12:31:41 -06:00 |
|
Mike Place
|
d5986c21b4
|
Rename kwarg in cloud runner
Closes #23403
|
2015-05-13 12:15:06 -06:00 |
|
Jacob Hammons
|
16d8a753ad
|
saltstack2 sphinx theme and build settings
|
2015-05-11 17:29:12 -06:00 |
|
David Boucha
|
5504778adf
|
update to proper examples
|
2015-05-07 18:08:05 +00:00 |
|
Colton Myers
|
7729834d92
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
salt/client/ssh/wrapper/__init__.py
|
2015-05-06 15:45:11 -06:00 |
|
Colton Myers
|
1fb84450f4
|
Merge pull request #23396 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
|
2015-05-06 15:42:35 -06:00 |
|
Colton Myers
|
23d4feb8b4
|
Merge remote-tracking branch 'upstream/2015.2' into 2015.5
|
2015-05-06 13:51:10 -06:00 |
|
Justin Findlay
|
8074d16d52
|
2015.2 -> 2015.5
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
|
2015-05-06 11:40:01 -06:00 |
|
Erik Johnson
|
d6b62f73a4
|
Update manpages to reflect 2015.2 rename to 2015.5
|
2015-05-06 11:13:13 -06:00 |
|
Erik Johnson
|
a7447ac681
|
Add missing RST file
|
2015-05-06 11:13:05 -06:00 |
|
Erik Johnson
|
23fa4402dc
|
Update manpages to reflect 2015.2 rename to 2015.5
|
2015-05-06 12:08:46 -05:00 |
|
Erik Johnson
|
4fea5ba477
|
Add missing RST file
|
2015-05-06 12:06:49 -05:00 |
|
Erik Johnson
|
0504e7a184
|
Update Lithium docstrings in 2015.2 branch
|
2015-05-06 11:01:53 -06:00 |
|
Colton Myers
|
8510a4c30e
|
Update to release notes from 2015.2 branch
|
2015-05-06 10:48:06 -06:00 |
|