Revert "Revert "Fixed merge conflicts"" (!16) · Merge requests · vta / saltstack

UNCLASSIFIED

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Christopher Apsey requested to merge revert-8fba4fb9 into master Apr 02, 2017

This reverts commit 8fba4fb9 - this commit wiped out 2 months of work - I'm halting all future merges to master until I can sort through everything.

This GitLab instance is accredited for unclassified information without any handling caveats (releasable content only)

Admin message

Revert "Revert "Fixed merge conflicts""

Merge request reports