Dennis
8ada53c7cc
broken link, adding /en/latest
...
http://docs.saltstack.com/index.html#configuration-management -> http://docs.saltstack.com/en/latest/index.html#configuration-management
2015-06-23 18:02:15 -07:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
Mike Place
3ff6eff546
Merge pull request #24632 from jacobhammons/bug-fixes
...
Doc bug fixes
2015-06-17 12:40:02 -06:00
Mike Place
7dae045b3c
Remove overstate documentation
2015-06-12 13:00:08 -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
Tim Baker
a39ecc3b99
Add extra clarification why jinja comments are needed.
2015-06-11 04:07:49 -04:00
Tim Baker
e57cdf5c7f
Fix typo
2015-06-11 04:04:21 -04:00
Tim Baker
bbdcc5af01
Add some documentation surrounding Jinja comments - refs #24492 , #21217 , #23359
2015-06-11 03:42:31 -04:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -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
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
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
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
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
Tyler Cipriani
db793dd0de
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 21:56:29 -06:00
Tyler Cipriani
8ec82b640d
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 11:13:29 -07: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
jpic
d733cfb629
Document DHCP usage on LXC < 1.0.7
2015-05-21 14:26:01 +02:00
Nitin Madhok
9dc1e0b3ae
Fixing sphinx errors and warnings
2015-05-18 12:12:07 -04:00
Colton Myers
1d77ae9072
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/ec2.py
salt/modules/hipchat.py
salt/modules/random_org.py
salt/modules/serverdensity_device.py
salt/modules/slack_notify.py
salt/returners/__init__.py
salt/states/iptables.py
2015-05-11 11:38:03 -06:00
Colton Myers
ece63c36a3
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/ssh/roster.rst
salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06: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
Seth House
dc6eac4f69
Deprecate Halite from the Salt docs
2015-05-05 16:01:35 -06:00
Joseph Hall
3dea1e98a1
Add tornado to http.query, and make it the default
2015-04-30 14:07:51 -06:00
Thomas S Hatch
de24ecfc90
Merge pull request #22966 from techhat/stormpathup
...
Updates to Stormpath as per @rdegges
2015-04-23 21:44:58 -06:00
Joseph Hall
2a4ef7ce3b
Updates to Stormpath as per Randall Degges
2015-04-22 15:59:09 -06:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -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
Erik Johnson
98885f71d6
Add information about libssh2 requirement for pygit2 ssh auth
2015-04-17 13:24:14 -05:00
Joseph Hall
7ee6103007
Adding and updating Stormpath modules
2015-04-17 08:37:23 -06:00
Nitin Madhok
931ece7d20
Fixing some spninx errors and violations
2015-03-31 12:54:32 -04:00
Nicolas Delaby
b01dfa9150
Add a note regarding pkg-config to install libgit2
2015-03-20 16:25:35 +01:00
Mike Place
56bac362fd
Change bootstrap instructions to two liner
2015-03-09 18:24:53 -06:00
Elias Probst
583239b893
Suggest a separate repo for top.sls.
...
This replaces the suggestion to keep `top.sls` out of other branches
which is rather unpractical, as it would require to manually delete
it from each new created branch and prevent deleting it when merging
the branch back into `master`.
2015-03-08 09:50:20 +01:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06: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
