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
d17c908b42
salt/doc/topics
History
Colton Myers d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
..
beacons Document becaon intervals 2015-02-26 18:00:12 -07:00
cloud Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-03-09 12:52:14 -06:00
development revise saltstack/salt contrib documentation 2015-02-25 15:05:21 -07:00
eauth Update salt_token name 2015-03-04 11:52:51 +01:00
event Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
ext_processes Whitespace cleanup 2014-12-11 07:53:19 -08:00
installation Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-02-23 14:25:51 -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 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-03-09 12:52:14 -06: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 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-03-09 12:52:14 -06:00
sdb Whitespace cleanup 2014-12-11 07:53:19 -08:00
ssh Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-13 12:09:56 -07:00
targeting Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop 2015-03-09 11:07:14 -06: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 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-02-18 11:55:29 -07:00
tutorials Suggest a separate repo for top.sls. 2015-03-08 09:50:20 +01:00
virt Whitespace cleanup 2014-12-11 07:53:19 -08:00
windows Change Github to GitHub 2015-02-15 15:19:54 +01: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 Change Github to GitHub 2015-02-15 15:19:54 +01:00