Colton Myers 098c39596a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/templates/rh_ip/rh5_eth.jinja salt/templates/rh_ip/rh6_eth.jinja salt/utils/templates.py		2015-01-21 11:19:06 -07:00
..
cloud	Modify how joyent driver handles SSL and URLs	2015-01-21 08:29:06 -07: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	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ext_processes	Whitespace cleanup	2014-12-11 07:53:19 -08:00
installation	Merge branch '2014.7' into merge-forward	2014-12-22 13:33:53 -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	Add docs for mine in salt-ssh	2014-12-23 12:14:31 -07:00
netapi	Whitespace cleanup	2014-12-11 07:53:19 -08:00
pillar	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
reactor	Whitespace cleanup	2014-12-11 07:53:19 -08:00
releases	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-21 11:19:06 -07: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	Comma cleanup	2014-12-12 11:39:55 -08:00
topology	Comma cleanup	2014-12-12 11:38:50 -08:00
transports/raet	Comma cleanup	2014-12-12 11:38:18 -08:00
troubleshooting	Whitespace cleanup	2014-12-11 07:53:19 -08:00
tutorials	Update HTTP tutorial for new functionality	2015-01-21 09:20:11 -07: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