Colton Myers cca8ddc886 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: .pylintrc .testing.pylintrc salt/auth/pam.py salt/modules/win_status.py salt/utils/network.py salt/utils/schedule.py tests/unit/renderers/gpg_test.py tests/unit/states/boto_secgroup.py		2015-04-29 12:01:52 -06:00
..
beacons	Document becaon intervals	2015-03-27 16:38:36 -06:00
cloud	Adding ability to modify/create SCSI adapters #22364	2015-04-18 17:09:11 -04:00
development	revise contributing documentation	2015-04-16 10:28:00 -06:00
eauth	Add authentication against Active Directory	2015-04-03 17:26:59 -06:00
event	Clarify the nature of auth and start events.	2015-04-24 12:46:32 -06: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-04-29 12:01:52 -06:00
jobs	Add detail for writing a returner	2015-03-31 13:59:11 -06:00
master_tops	Whitespace cleanup	2014-12-11 07:53:19 -08:00
mine	Clarify Mine Functions Aliases documentation	2015-03-10 11:12:17 -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	Added note about debugging reactor files to see the rendered output	2015-04-28 14:48:38 -06:00
releases	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-20 11:39:41 -06:00
sdb	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ssh	Update index.rst salt-ssh doc	2015-03-18 22:35:04 -07:00
targeting	Merge pull request #23058 from plastikos/improvement-compound_as_list	2015-04-25 10:57:49 -06:00
topology	Fixing some spninx errors and violations	2015-03-31 12:54:32 -04:00
transports	typo fixing!	2015-04-08 09:15:50 -07:00
troubleshooting	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-18 11:55:29 -07:00
tutorials	Merge pull request #22966 from techhat/stormpathup	2015-04-23 21:44:58 -06: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