saltstack/salt — pull request #13666 by babilen (2014-06-24 11:42:31+00:00)
Title: Revert "Add master local ip mapping to minion id checking"

This reverts commit 1f890ea9592e6237b831306a4376a19dec8fb682and fixes #13665. Please read the discussion in that bug report as I am, as of now, not entirely sure if this fix might introduce regressions.

Conflicts:
salt/utils/minions.py