valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ebe7eeafd9
salt/doc/topics
History
Colton Myers ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
2015-03-11 15:14:56 -06:00
..
beacons Fixed typos in the beacon docs 2015-01-26 18:20:54 -07:00
cloud Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-11 15:14:56 -06:00
development Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-15 16:20:48 -07:00
eauth Whitespace cleanup 2014-12-11 07:53:19 -08:00
event Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
ext_processes Whitespace cleanup 2014-12-11 07:53:19 -08:00
installation Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-20 13:51:59 -07:00
jobs Comma cleanup 2014-12-12 11:40:36 -08:00
master_tops Whitespace cleanup 2014-12-11 07:53:19 -08:00
mine 2015.2 --> 2015.2.0 2015-03-05 15:02:01 -07:00
netapi Whitespace cleanup 2014-12-11 07:53:19 -08:00
pillar add pillar_safe_render_error config 2015-03-04 10:22:29 -05:00
projects Whitespace cleanup 2014-12-11 07:53:19 -08:00
reactor Merge remote-tracking branch 'salt/2014.7' into 2015.2 2015-02-18 11:33:10 -07:00
releases Note the change to tcp keepalives in release notes 2015-03-10 10:45:16 -06:00
sdb Whitespace cleanup 2014-12-11 07:53:19 -08:00
ssh Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-13 11:58:58 -07:00
targeting Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-23 16:13:30 -07:00
topology Comma cleanup 2014-12-12 11:38:50 -08:00
transports/raet Remove "Lithium" and change to "2015.2.0" for versionadded tags 2015-03-05 12:44:22 -07:00
troubleshooting Tweak section header 2015-02-10 15:06:43 -06:00
tutorials Update LXC tutorial to reflect function name change 2015-02-27 23:10:22 -06:00
virt Whitespace cleanup 2014-12-11 07:53:19 -08:00
windows Whitespace cleanup 2014-12-11 07:53:19 -08:00
yaml Whitespace cleanup 2014-12-11 07:53:19 -08:00
best_practices.rst Merge branch '2014.7' into develop 2014-12-23 10:57:26 -07:00
index.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00