rallytime
|
494a06bee2
|
Merge branch '2016.11' into 'develop'
Conflicts:
- doc/ref/configuration/minion.rst
|
2016-12-20 10:03:44 -07:00 |
|
rallytime
|
02bfe7912c
|
Remove more ":doc:" references from doc/* files
|
2016-12-15 15:36:44 -07:00 |
|
Eric Radman
|
3f2e13d1fc
|
Remove repeated words in docs (#37871)
Found using
find . -name '*.rst' | xargs igor -R -r
|
2016-11-23 14:53:17 -07:00 |
|
Benjamin Drung
|
6db9724ec7
|
Fix typo doesnt -> doesn't
|
2016-02-04 12:38:29 +01: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 |
|
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 |
|
Thomas S Hatch
|
31f49947b9
|
Merge pull request #24026 from jpic/fix/lxc_network_profile
Document DHCP usage on LXC < 1.0.7
|
2015-06-02 14:41:19 -06:00 |
|
Colton Myers
|
669938f28d
|
s/you ll/you'll/
|
2015-05-29 16:53:37 -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 |
|
jpic
|
d733cfb629
|
Document DHCP usage on LXC < 1.0.7
|
2015-05-21 14:26:01 +02:00 |
|
Erik Johnson
|
0504e7a184
|
Update Lithium docstrings in 2015.2 branch
|
2015-05-06 11:01:53 -06:00 |
|
Erik Johnson
|
c734a7db18
|
Update LXC tutorial to reflect function name change
|
2015-02-27 23:10:22 -06: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
|
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 |
|