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
2b1f400ab4
salt/doc/topics
History
Colton Myers 2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -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-13 17:02:19 -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 issue number 2015-03-11 12:19:51 -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 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-19 16:03:29 -06: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