Wayne Werner 938218326c Update changelog ... - Add all PRs/issues to CHANGELOG.md - Add gitattributes merge=union for CHANGELOG.md This should avoid most merge conflicts - Try merge=union for release notes - Remove dupes from changelog - Update credits and add chroot to releasenotes - Remove bad releasenotes info As a result of porting to master there were extra bits of information that got in before the actual changes. These have been removed.		2020-01-27 09:33:43 -06:00
..
beacons	Porting #50261 to master.	2020-01-18 22:11:35 -08:00
blackout	Replaced test.ping with test.version	2019-03-25 12:09:48 -05:00
cache
cloud	Merge branch 'master' of https://github.com/saltstack/salt into tenentcloud_201921	2020-01-03 12:33:12 -07:00
configuration
development	Merge branch 'master' into update_neon_reference	2020-01-16 15:07:51 -07:00
eauth	Merge branch '2018.3' into '2019.2'	2019-03-28 11:10:45 -04:00
engines	update neon reference	2020-01-15 18:25:22 +00:00
event	Merge branch '2018.3' into '2019.2'	2019-03-28 11:10:45 -04:00
execution	Porting PR #51053 to 2019.2.1	2019-09-18 17:42:17 -07:00
ext_processes
grains	Porting PR #49616 to 2019.2.1	2019-09-18 18:08:37 -07:00
highavailability
installation	Merge branch 'master' into 2019_2_1_port_51327	2019-12-16 17:05:16 -07:00
jinja	update neon reference	2020-01-15 18:25:22 +00:00
jobs
master_tops
matchers	update neon reference	2020-01-15 18:25:22 +00:00
mine	more neon/3000 updates	2020-01-16 22:05:26 +00:00
netapi
network_automation	Fix Typos "swtich" to "switch"	2019-03-19 13:59:36 +01:00
orchestrate
pillar	Update docs for the configurable branch	2019-10-25 18:29:42 +01:00
projects
proxyminion	Deprecate salt/utils/__init__.py functions	2019-12-23 09:35:51 -05:00
reactor
releases	Update changelog	2020-01-27 09:33:43 -06:00
return_codes
sdb	fix spelling error	2019-12-18 17:25:00 -05:00
slots	update neon reference	2020-01-15 18:25:22 +00:00
solaris
spm
ssh	Merge branch '2018.3' into '2019.2'	2019-03-28 11:10:45 -04:00
states	fix doc, module.run example missing module name	2019-10-21 17:36:44 -06:00
targeting	Merge branch '2018.3' into '2019.2'	2019-03-28 11:10:45 -04:00
thorium	Merge remote-tracking branch 2018.3 into master	2019-10-16 10:17:36 -04:00
topology	Replaced test.ping with test.version	2019-03-25 12:09:48 -05:00
transports	Remove support for RAET	2019-10-10 09:46:39 +01:00
troubleshooting	Seperate code-block directive with a blank line	2019-12-05 00:58:02 +01:00
tutorials	Merge pull request #55573 from Ch3LL/issue_49422	2019-12-21 09:43:11 -07:00
utils
venafi	Copy pasting changes from branch venafi-fix	2020-01-14 05:55:19 +00:00
virt
windows	Update windows-package-manager.rst	2020-01-06 23:52:56 +00:00
yaml
api.rst
best_practices.rst
hardening.rst
index.rst	Merge pull request #55197 from sramkrishna/patch-1	2019-12-16 16:52:15 -07:00
using_salt.rst