rallytime
b27a15e774
Remove "workaround" wording
2015-06-04 11:39:39 -06:00
rallytime
9fff35a959
Some small fixes
2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6
Link the new labels doc in contributing and hacking docs
2015-06-04 11:39:39 -06:00
rallytime
375695e696
Add pull request label definitions
2015-06-04 11:39:39 -06:00
rallytime
de945638d3
Add Feature Request label definition
2015-06-04 11:39:39 -06:00
rallytime
684f291bd4
Add issue definition and augment functional areas section
2015-06-04 11:39:39 -06:00
rallytime
2da13dd525
Start a "what are all of these labels for?" doc
2015-06-04 11:39:38 -06:00
zhujinhe
f08c875015
fix invoke issues of Jinja Macros example
...
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
2015-06-03 16:38:16 -06:00
rallytime
f5ec1a1693
Add 2015.5.2 release notes
2015-06-03 13:27:17 -06:00
rallytime
a235b114d7
Remove references to mount_points in ec2 docs
...
Fixes #14021
2015-06-02 16:32:26 -06:00
Joseph Hall
ca535a6ff4
Add warning about destroying maps
2015-06-01 15:25:58 -06:00
Jason Thigpen
beff7c7785
Correct usage of import_yaml in formula documentation
2015-05-31 09:43:15 -06:00
Colton Myers
669938f28d
s/you ll/you'll/
2015-05-29 16:53:37 -06:00
Colton Myers
75590cf490
Merge pull request #24080 from makinacorpus/lxc_consistency2
...
Lxc consistency2
2015-05-29 16:51:54 -06:00
rallytime
8d51f75aa5
Clarify digital ocean documentation and mention v1 driver deprecation
...
Fixes #21498
2015-05-29 14:14:19 -06:00
Colton Myers
e5ba31b5b5
2015.5.1 release date
2015-05-28 10:19:47 -06:00
Tyler Cipriani
db793dd0de
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 21:56:29 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
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
Mathieu Le Marec - Pasquet
458b18b7e6
more lxc docs
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-23 15:19:54 +02:00
Mathieu Le Marec - Pasquet
ef1f95231a
lxc docs: typos
2015-05-23 14:49:34 +02:00
Mathieu Le Marec - Pasquet
d67a43dc1f
more lxc docs
2015-05-23 14:45:43 +02:00
Mathieu Le Marec - Pasquet
ce11d8352e
lxc: Global doc refresh
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-22 23:21:13 +02: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
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
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
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
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
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
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
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
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
Colton Myers
3255fbc0d5
Rename the release notes
2015-05-06 10:47:16 -06:00
Erik Johnson
20006b06f6
Update Lithium docstrings in 2014.7 branch
2015-05-06 09:12:37 -05:00
Colton Myers
fd09cdae6f
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/ssh/roster.rst
salt/client/ssh/__init__.py
salt/client/ssh/wrapper/__init__.py
salt/config.py
salt/modules/file.py
salt/runners/lxc.py
2015-05-05 16:26:39 -06:00
Colton Myers
b261c95cd6
Add note to 2015.2.0 release notes about master opts in pillar
2015-05-05 16:14:42 -06:00
Colton Myers
b2f033f485
Add CLI note
2015-05-05 16:02:26 -06:00
Colton Myers
48e7b3ee4f
Add warning about python_shell changes to 2015.2.0 release notes
2015-05-05 15:54:50 -06:00
Colton Myers
c223309bb7
Add versionadded
2015-05-05 12:44:50 -06:00
Colton Myers
c273ea14c6
Add minion config to salt-ssh doc
2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3
Add minion_opts to roster docs
2015-05-04 14:46:16 -06:00
Seth House
35c91881ab
Added note about debugging reactor files to see the rendered output
2015-04-28 14:48:38 -06:00
Colton Myers
a8f797e0e4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-28 09:48:53 -06:00
rallytime
f6cc7c8f8a
Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages
...
Removed the chrislea ppa third party installation information. This
shouldn't be needed anymore for any Ubuntu package after 2014.7.5.
2015-04-27 15:57:41 -06:00
C. R. Oldham
63fafe961e
Clarify the nature of auth and start events.
2015-04-24 12:46:32 -06:00
Colton Myers
1f9934c634
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
2015-04-20 11:39:41 -06:00
Justin Findlay
900c7a510f
Merge pull request #22800 from terminalmage/issue21979
...
Improve error logging for pygit2 SSH-based remotes
2015-04-18 11:18:55 -06:00
Justin Findlay
e99f2fdb28
Merge pull request #22813 from twangboy/win_doc_fix
...
Updated instructions for building salt
2015-04-17 22:10:07 -06:00
twangboy
adc421acdd
Fixed some formatting issues
2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6
Updated instructions for building salt
2015-04-17 14:41:46 -06:00
rallytime
5931a582d1
Replace all 4s with 5s
2015-04-17 14:15:33 -06:00
rallytime
eadaead755
Add 2014.7.5 links to windows installation docs
2015-04-17 14:13:40 -06:00
Erik Johnson
98885f71d6
Add information about libssh2 requirement for pygit2 ssh auth
2015-04-17 13:24:14 -05:00
rallytime
fde1feed46
Remove extra line
2015-04-17 11:42:14 -06:00
rallytime
b19b95d992
Added release note for 2014.7.5 release
2015-04-17 11:41:07 -06:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
Corin Kochenower
60b48ce1c0
Simple textual change
2015-04-14 08:54:34 -06:00
rallytime
fb03af37d3
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:29:55 -06:00
rallytime
9eb273f097
Add batch matching bug note to known issues in 2014.7.4 release notes
2015-04-13 13:35:48 -06:00
Thomas S Hatch
fbf35f94ab
Merge pull request #22491 from plastikos/improvement-nested_nodegroups
...
improvement: Support nested nodegroups
2015-04-10 09:17:27 -06:00
shanedlee
c874ca8c20
Added additional details regarding windows implementation
2015-04-09 11:32:13 -04:00
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
Joseph Hall
aa23eb0e26
Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs
...
Migrate old cloud config documentation to own page
2015-04-08 12:32:35 -06:00
Colton Myers
5f1a4b45b8
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-08 10:38:34 -06:00
rallytime
cecca10668
Kill legacy cloud configuration syntax docs per techhat
2015-04-07 20:09:37 -06:00
rallytime
52a3d500e8
Beef up cloud configuration syntax and add pillar config back in
2015-04-07 18:56:40 -06:00
rallytime
9b5318fe71
Move old cloud syntax to "Legacy" cloud config doc
2015-04-07 18:41:21 -06:00
rallytime
7a9ce92dd9
Add docs explaing file_map upload functionality
...
Fixes #16886
2015-04-07 17:23:02 -06:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Kevin Bowling
f324d38f8c
2015.2 relnotes edits
2015-04-06 14:36:51 -07:00
C. R. Oldham
06d761671a
Add authentication against Active Directory
2015-04-03 17:26:59 -06:00
C. R. Oldham
ade043070d
Add authentication against Active Directory
2015-04-03 17:26:59 -06:00
rallytime
eac4c63990
Add list_node docs to Cloud Function page
2015-04-03 16:30:58 -06:00
rallytime
bf31daa82e
Add Feature Matrix link to cloud action and function pages
2015-04-03 16:15:50 -06:00
rallytime
d5fa02d566
Add list_node* functions to feature matrix
2015-04-03 15:59:16 -06:00
Thomas S Hatch
4281cd67fa
Merge pull request #22300 from rallytime/windows_release_docs
...
Add windows package installers to docs
2015-04-02 17:45:38 -06:00
Seth House
a8bdc17bbf
Better explanations and more examples of how the Reactor calls functions
...
Refs #20841
2015-04-02 17:07:22 -06:00
Thomas S Hatch
d2e4ac840d
Merge pull request #22212 from ckochenower/2015.2
...
Add detail for writing a returner
2015-03-31 15:15:52 -06:00
Corin Kochenower
f44e25715a
Add detail for writing a returner
2015-03-31 13:59:11 -06:00
