Justin Findlay
|
0447808d95
|
clarify, motivate orchestration docs
|
2015-07-10 17:03:27 -06:00 |
|
rallytime
|
d0b61f3fc1
|
A couple of doc fixes for the http tutorial
|
2015-07-07 15:12:36 -06:00 |
|
Mike Place
|
3ff6eff546
|
Merge pull request #24632 from jacobhammons/bug-fixes
Doc bug fixes
|
2015-06-17 12:40:02 -06:00 |
|
Jacob Hammons
|
c7cdd416a2
|
Doc bug fixes
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
|
2015-06-12 11:23:52 -06:00 |
|
Tim Baker
|
f13cd418bc
|
Add extra clarification why jinja comments are needed.
|
2015-06-12 10:45:41 -06:00 |
|
Tim Baker
|
23749718bb
|
Fix typo
|
2015-06-12 10:45:41 -06:00 |
|
Tim Baker
|
6a917471d4
|
Add some documentation surrounding Jinja comments - refs #24492, #21217, #23359
|
2015-06-12 10:45:41 -06:00 |
|
Jacob Hammons
|
d45c4ed11f
|
Bug fixes and build errors
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
|
2015-06-05 17:32:35 -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 |
|
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 |
|
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
|
ce11d8352e
|
lxc: Global doc refresh
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
|
2015-05-22 23:21:13 +02: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 |
|
Erik Johnson
|
0504e7a184
|
Update Lithium docstrings in 2015.2 branch
|
2015-05-06 11:01:53 -06:00 |
|
Erik Johnson
|
20006b06f6
|
Update Lithium docstrings in 2014.7 branch
|
2015-05-06 09:12:37 -05: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 |
|
Erik Johnson
|
98885f71d6
|
Add information about libssh2 requirement for pygit2 ssh auth
|
2015-04-17 13:24:14 -05:00 |
|
Erik Johnson
|
c734a7db18
|
Update LXC tutorial to reflect function name change
|
2015-02-27 23:10:22 -06:00 |
|
Erik Johnson
|
341b6622c8
|
gitfs: Add warning about ssh:// URLs (dulwich)
|
2015-02-27 14:53:57 -07:00 |
|
Erik Johnson
|
4ce8a9d064
|
Improve salt fileserver documentation
|
2015-02-27 14:53:57 -07:00 |
|
Erik Johnson
|
ccf99c7405
|
Add example of clearing gitfs cache pre-2015.2.0
|
2015-02-27 14:53:55 -07:00 |
|
Erik Johnson
|
815a1befa9
|
Add note about dulwich gitfs cache incompatibility
|
2015-02-27 14:53:55 -07:00 |
|
Erik Johnson
|
ff66ad3d11
|
Correct location of network configuration for Debian/Ubuntu
|
2015-02-27 18:16:13 +01:00 |
|
Erik Johnson
|
48fed17876
|
Add warnings about static IP configuration
|
2015-02-27 18:12:18 +01:00 |
|
Erik Johnson
|
a2452aa611
|
gitfs: Add warning about ssh:// URLs (dulwich)
|
2015-02-24 22:37:30 -06:00 |
|
Erik Johnson
|
db85cd43f7
|
Improve salt fileserver documentation
|
2015-02-24 22:37:30 -06:00 |
|
Erik Johnson
|
61cfed60a1
|
Add example of clearing gitfs cache pre-2015.2.0
|
2015-02-24 22:37:28 -06:00 |
|
Erik Johnson
|
5bb28b6969
|
Add note about dulwich gitfs cache incompatibility
|
2015-02-24 22:37:28 -06:00 |
|
Erik Johnson
|
89a58ac4c2
|
Update the LXC tutorial
This updates the tutoral to reflect the new profile merging behavior.
|
2015-02-10 15:06:47 -06:00 |
|
Erik Johnson
|
1530470339
|
No need to mention that Debian Jessie hasn't been released
|
2015-02-10 15:06:46 -06:00 |
|
Erik Johnson
|
10238f8be7
|
Add warnings about creating containers from rootfs image
|
2015-02-10 15:06:46 -06:00 |
|
Erik Johnson
|
1ea87ccaa9
|
Formatting tweak (for consistency)
|
2015-02-10 15:06:46 -06:00 |
|
Erik Johnson
|
a8fe526d20
|
Replace references to "next feature release" with 2015.2.0
|
2015-02-10 15:06:46 -06:00 |
|
Erik Johnson
|
832df20df2
|
Complete initial draft of LXC tutorial
This will need to be filled out, but this is a good starting point.
|
2015-02-10 15:06:45 -06:00 |
|
Erik Johnson
|
c4fc5f5fa4
|
More info for LXC tutorial
|
2015-02-10 15:06:45 -06:00 |
|
Erik Johnson
|
2dad71adc9
|
Add more info to LXC tutorial
|
2015-02-10 15:06:45 -06:00 |
|
Erik Johnson
|
196a7d6327
|
Stub for LXC tutorial
|
2015-02-10 15:06:43 -06:00 |
|
Colton Myers
|
56520f4ac9
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
|
2015-02-06 13:00:14 -07:00 |
|
Seth House
|
15936658ba
|
Added cross-references to other ways to preseed minion keys
|
2015-02-05 19:15:46 -07:00 |
|
Joseph Hall
|
f5e8b4a10e
|
Don't default CA bundle updates to a non-standard location
|
2015-01-28 20:09:13 -07:00 |
|
Joseph Hall
|
f846925ba7
|
Document text_out and headers_out
|
2015-01-28 11:08:31 -07:00 |
|
Joseph Hall
|
d1746fa7fe
|
Document updating CA bundles
|
2015-01-28 10:51:04 -07:00 |
|
Colton Myers
|
c1e630340e
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
salt/fileserver/gitfs.py
salt/grains/core.py
|
2015-01-22 16:46:32 -07:00 |
|
robert.fach
|
4f7b0a29d1
|
updated information regarding required version for dulwich gitfs backend
|
2015-01-22 17:14:27 +01:00 |
|
Joseph Hall
|
483e84c78a
|
Update HTTP tutorial for new functionality
|
2015-01-21 09:20:11 -07:00 |
|
Colton Myers
|
88fb2e0036
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
doc/topics/tutorials/starting_states.rst
salt/modules/linux_lvm.py
|
2015-01-20 15:19:53 -07:00 |
|
Colton Myers
|
1fb6fc0ba1
|
Fix the explanation of the Default Data - YAML section of starting states
|
2015-01-20 15:03:54 -07:00 |
|
Colton Myers
|
dc778a8e5e
|
Merge branch '2014.7' into develop
Conflicts:
salt/client/ssh/__init__.py
salt/states/boto_secgroup.py
|
2014-12-23 10:57:26 -07:00 |
|