Colton Myers
|
5fcbcfe6d5
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
|
2015-05-29 17:33:28 -06:00 |
|
Colton Myers
|
75590cf490
|
Merge pull request #24080 from makinacorpus/lxc_consistency2
Lxc consistency2
|
2015-05-29 16:51:54 -06:00 |
|
Colton Myers
|
c4f5e231fa
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
|
2015-05-29 15:10:13 -06:00 |
|
Jacob Hammons
|
0689815d0e
|
Fixes for doc build errors
|
2015-05-27 11:40:31 -06: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 |
|
Seth House
|
dc6eac4f69
|
Deprecate Halite from the Salt docs
|
2015-05-05 16:01:35 -06:00 |
|
Thomas Jackson
|
c18e834be1
|
Fix trailing whitespace
Conflicts:
doc/topics/tutorials/states_pt2.rst
|
2014-12-11 07:53:19 -08:00 |
|
Nitin Madhok
|
71d964bccf
|
Removing non existing document
|
2014-11-18 03:10:59 -05:00 |
|
Colton Myers
|
99e97320e1
|
Merge branch '2014.7' into develop
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
|
2014-09-22 14:22:54 -06:00 |
|
Erik Johnson
|
604a131f6f
|
Fix sphinx build error
|
2014-09-17 18:00:18 -05:00 |
|
Hung Nguyen Viet
|
d47b8be40f
|
remove duplicate entry, it was in advanced topics
|
2014-09-16 14:16:17 +07:00 |
|
Seth House
|
ab508cb9d3
|
Fix maxdepth TOC for Salt at Scale tutorials
|
2014-08-01 12:05:22 -06:00 |
|
vs
|
f440b0f111
|
link in the multimaster_pki_tutorial
|
2014-07-15 03:41:12 -07:00 |
|
Thomas S Hatch
|
487c5f5a33
|
Merge pull request #14083 from hvnsweeting/hvn-doc-update
Salt virt/cloud doc update
|
2014-07-10 14:36:35 -06:00 |
|
Hung Nguyen Viet
|
81d74c1080
|
avoid confusing with salt-cloud
|
2014-07-10 11:15:17 +07:00 |
|
btibi
|
f69977d3e5
|
Add syslog_ng state module.
|
2014-07-09 22:04:13 +02:00 |
|
vs
|
328e6478aa
|
"using salt at scale" tutorial for the docs
|
2014-06-05 01:36:46 -07:00 |
|
Mike Place
|
cfa859c76e
|
Reconsile docs and fix build warnings.
|
2014-03-14 14:18:56 -06:00 |
|
Erik Johnson
|
16ba779b7a
|
Add new page to toctree
|
2014-03-13 21:01:06 -05:00 |
|
Mike Place
|
6af7ff5dff
|
First pass at refactoring Salt documentation.
|
2014-02-26 13:31:11 -07:00 |
|
Seth House
|
915ad76273
|
Added all tutorials to a local TOC
|
2013-01-23 23:29:59 -07:00 |
|