changed to ephemeral yard raet
Refine publish.publish timeout
Merge branch 'sam_raet_50' into ephemeral

Conflicts:
	salt/daemons/flo/core.py
updated
Fix potential KeyError in schedule.delete and more unit tests
Reformat changes to schedule.reload
Merge pull request #14035 from cachedout/12655

Don't use generic timeout, instead check for returned minions.
lint
fix git pillar tests
Fix where=None bug
Skip tests if no internet connection
Merge pull request #14038 from pass-by-value/skip_tests_if_no_network

Skip tests if no internet connection
Fix gitfs tests

This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
Merge pull request #14039 from terminalmage/fix-gitfs-tests

Fix gitfs tests
Merge pull request #14037 from rallytime/schedule_tests

Fix KeyError in schedule.delete and more schedule unit tests
Consistent worker yard names
Merge remote-tracking branch 'upstream/develop' into sam_raet_50
Merge pull request #14041 from SmithSamuelM/sam_raet_50

Salt Raet with support for new raet v0.2.00 with ephemeral Lane Yards
Refactored cleanup behavior so now it cleans up stale uxd socket files
Merge remote-tracking branch 'upstream/develop' into sam_raet_50