Join GitHub today
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used #27876
If the new gitfs-backed git_pillar configuration schema is used, the
It will likely conflict when merging forward as the init_git_pillar code in masterapi.py has undergone changes in 2015.8. If it does conflict, the 2015.8 side of the conflict should be assumed to be correct, and the 2015.5 version should be ignored.
I've notified @basepi about this potential conflict and will work with him to resolve it when we next merge forward after this PR is merged.