nee2c/salt: saltstack @ resolve-conflict-#54907

Pedro Algarvio 98dbaf525d Update pipeline to use the newer salt pipeline library		vor 5 Jahren
..
docs	ed0dccaeff Nox docs build now builds HTML docs and Man pages	vor 5 Jahren
kitchen-amazon1-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-amazon2-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-amazon2-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-archlts-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-archlts-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos6-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py2-m2crypto	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py2-proxy	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py2-pycryptodomex	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py2-tcp	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py2-tornado	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py3-m2crypto	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py3-proxy	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py3-pycryptodomex	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-centos7-py3-tcp	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-debian10-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-debian8-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-debian9-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-debian9-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-fedora29-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-fedora29-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-fedora30-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-fedora30-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-macosxmojave-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-macosxmojave-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-opensuse15-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-opensuse15-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py2-m2crypto	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py2-proxy	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py2-pycryptodomex	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py2-tcp	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py2-tornado	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py3-m2crypto	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py3-proxy	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py3-pycryptodomex	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1604-py3-tcp	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1804-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-ubuntu1804-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-windows2016-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-windows2016-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-windows2019-py2	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
kitchen-windows2019-py3	98dbaf525d Update pipeline to use the newer salt pipeline library	vor 5 Jahren
lint	8fe38ce861 improve lint job	vor 5 Jahren