Colton Myers 26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/conf.py salt/config/__init__.py salt/modules/rh_ip.py salt/pillar/s3.py salt/returners/local_cache.py salt/states/user.py salt/templates/rh_ip/rh7_eth.jinja		2015-09-17 11:10:37 -06:00
..
beacons	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
cloud	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-17 11:10:37 -06:00
development	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-14 15:01:41 -06:00
eauth	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-20 13:31:46 -06:00
event	Additions for #24042	2015-07-30 15:43:21 -06:00
ext_processes	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
highavailability	Doc on using syndic with multimaster	2015-07-31 15:25:15 -06:00
installation	Updated key instruction on rhel7	2015-09-15 10:04:57 -06:00
jobs	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-01 15:35:21 -06:00
master_tops	Whitespace cleanup	2014-12-11 07:53:19 -08:00
mine	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-11 13:15:38 -06:00
netapi	Whitespace cleanup	2014-12-11 07:53:19 -08:00
pillar	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-30 16:54:44 -06:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxyminion	Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py	2015-09-01 17:09:35 -06:00
reactor	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-17 11:10:37 -06:00
releases	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-17 11:10:37 -06:00
sdb	Whitespace cleanup	2014-12-11 07:53:19 -08:00
spm	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-14 15:01:41 -06:00
ssh	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-03 14:24:45 -06:00
targeting	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-20 13:31:46 -06:00
topology	[doc] topology / proxyminions fix typos	2015-08-19 14:03:14 +02:00
transports	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
troubleshooting	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06:00
tutorials	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
virt	Whitespace cleanup	2014-12-11 07:53:19 -08:00
windows	Add link to winrepo.update_git_repos runner function for consistency.	2015-09-09 09:04:52 -05:00
yaml	Whitespace cleanup	2014-12-11 07:53:19 -08:00
best_practices.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-20 13:55:14 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-16 15:13:53 -06:00