Changed how timeout works in RAETChannel
Changed how timeout works in RAETChannel
Merge branch '2014.7' of github.com:cro/salt into 2014.7
updated versionadded directive to a few modules (Helium -> 2014.7.0)
Fix for #16455

This reverts 5fdd86, which introduced a self-referential dictionary-- which mean that it could never be garbage collected.
Merge pull request #16534 from cro/2014.7

Backport RAET timeout patch
Merge pull request #16554 from juiceinc/2014.7

updated versionadded directive to a few modules (Helium -> 2014.7.0)
Clean up boto_secgroup unit test

This test required some tweaks as there are new versions of boto and moto
Merge pull request #16562 from rallytime/bp-16559

Backport #16559 to 2014.7
Wrap the split modules in objects, so we can avoid the attr/value ordering problem
Move to use lambda, to keep pylint happy
Minor wording fix in highstate docs

This fixes some grammar weirdness.
Merge remote-tracking branch 'upstream/pr/16557' into 2014.7
No need to check if process is alive. Fixes #16487. Refs #16317.

There's no need to check for a live process because since we're changing flags on the file descriptor, if it's not none, we
reset the flags.
Merge pull request #16569 from s0undt3ch/hotfix/vt-freezes-on-osx

No need to check if process is alive. Fixes #16487. Refs #16317.
Merge pull request #16566 from terminalmage/docs

Minor wording fix in highstate docs
Set the cachedir to a relative path
Set the cachedir to a relative path
Set the cachedir to a relative path
Set the cachedir to a relative path