fix beacons on dev

Add http proxy support for minion

Fixes jinja in include block

Use a different group name for GID 0 depending on the minion's O/S

fix default dict warning with saltstack dev version

Arch Linux: install pygit2 or libgit2 via pacman instead of source

Alpine Linux: add basic support

Added beacon configuration support

Some Unix variants name GID 0 "wheel".  Unfortunately, one cannot
specify this group by ID, because Python conflates integer 0 with
boolean False, nor can one specify this group using the string '0',
because of assumptions in the Salt or Python codebases regarding group
names.

Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt

Fix pygit2-libgit2 builds on Debian like platforms.

Correction for Fedora packaging.

Signed-off-by: Rene Jochum <rene@jochums.at>

Have salt-api service watch the master config files

The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.

allow non-default config settings in master.d/f_defaults.conf …

Pkgrepo cleanup

Correct SmartOS config path

Add SmartOS salt-master, minion and gitfs support

update map.jinja after Arch renamed the package

make the configuration of engines specific to master or minion

Add state that ensures pkgrepo for RedHat is absent

Change default value for pillar_opts

Adding support for master_id option

typo - top_file_merging_strategy (f_defaults.conf) template

Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.

the engines are now configured using the following pillars:

* salt.master.engines
* salt.minion.engines

instead of a global salt.engines pillar.

Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)