.github/workflows/docs.yml

@@ -0,0 +1,135 @@
+name: Docs
+
+on: [push, pull_request]
+
+jobs:
+  Salt:
+    name: Build Salt Documentation
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      run: |
+        apt-get update
+        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
+
+    - uses: actions/checkout@v2
+
+    - name: Set Python Version Env Var
+      run: |
+        echo PY_VERSION=$(python -c 'import sys; print("{}.{}".format(*sys.version_info))') >> $GITHUB_ENV
+
+    - name: Install Nox
+      run: |
+        python -m pip install --upgrade pip
+        pip install nox
+
+    - id: changed-files
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          docs:
+            - docs/**
+
+    - name: Set Docs Python Cache Key
+      run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+
+    - name: Setup Nox Cache
+      uses: pat-s/always-upload-cache@v2.1.3
+      with:
+        path: .nox/
+        key: docs-salt|${{ env.PY }}|${{ hashFiles(format('requirements/static/ci/py{0}/*.txt', env.PY_VERSION)) }}
+
+    - name: Install Python Requirements
+      env:
+        PIP_EXTRA_INDEX_URL: https://artifactory.saltstack.net/artifactory/api/pypi/pypi-open/simple/
+      run:
+        nox --install-only --forcecolor -e 'docs-html(compress=False, clean=True)'
+
+    - name: Build Docs
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e 'docs-html(compress=False, clean=True)'
+
+    - name: Store Generated Documentation
+      uses: actions/upload-artifact@v2
+      with:
+        name: salt-html-docs
+        path: doc/_build/html
+
+  Manpages:
+    name: Build Salt man Pages
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      run: |
+        apt-get update
+        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+
+    - uses: actions/checkout@v2
+
+    - id: changed-files
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          docs:
+            - docs/**
+
+    - name: Set Python Version Env Var
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      run: |
+        echo PY_VERSION=$(python -c 'import sys; print("{}.{}".format(*sys.version_info))') >> $GITHUB_ENV
+
+    - name: Install Nox
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      run: |
+        python -m pip install --upgrade pip
+        pip install nox
+
+    - name: Set Docs Python Cache Key
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+
+    - name: Setup Nox Cache
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      uses: pat-s/always-upload-cache@v2.1.3
+      with:
+        path: .nox/
+        key: docs-man|${{ env.PY }}|${{ hashFiles(format('requirements/static/ci/py{0}/*.txt', env.PY_VERSION)) }}
+
+    - name: Install Python Requirements
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      env:
+        PIP_EXTRA_INDEX_URL: https://artifactory.saltstack.net/artifactory/api/pypi/pypi-open/simple/
+      run:
+        nox --install-only --forcecolor -e 'docs-man(compress=False, update=False, clean=True)'
+
+    - name: Build Manpages
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e 'docs-man(compress=False, update=False, clean=True)'
+
+    - name: Store Generated Documentation
+      if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
+      uses: actions/upload-artifact@v2
+      with:
+        name: salt-man-pages
+        path: doc/_build/man

.github/workflows/lint.yml

@@ -0,0 +1,137 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  Salt:
+    name: Lint Salt's Source Code
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      run: |
+        apt-get update
+        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+
+    - uses: actions/checkout@v2
+
+    - name: Set Python Version Env Var
+      run: |
+        echo PY_VERSION=$(python -c 'import sys; print("{}.{}".format(*sys.version_info))') >> $GITHUB_ENV
+
+    - name: Install Nox
+      run: |
+        python -m pip install --upgrade pip
+        pip install nox
+
+    - name: Set Lint Python Cache Key
+      run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+
+    - name: Setup Nox Cache
+      uses: pat-s/always-upload-cache@v2.1.3
+      with:
+        path: .nox/
+        key: lint-salt|${{ env.PY }}|${{ hashFiles(format('requirements/static/ci/py{0}/*.txt', env.PY_VERSION)) }}
+
+    - id: changed-files
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          salt:
+            - added|modified:
+              - setup.py
+              - noxfile.py
+              - salt/**/*.py
+              - tasks/**/*.py
+
+    - name: Install Python Requirements
+      env:
+        PIP_EXTRA_INDEX_URL: https://artifactory.saltstack.net/artifactory/api/pypi/pypi-open/simple/
+      run:
+        nox --install-only --forcecolor -e lint-salt
+
+    - name: Lint Changed Files
+      if: github.event_name == 'pull_request' && steps.changed-files.outputs.salt == 'true'
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e lint-salt -- ${{ join(fromJSON(steps.changed-files.outputs.salt_files), ' ') }}
+
+    - name: Lint ALL Files
+      if: steps.changed-files.outputs.salt == 'true'
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e lint-salt
+
+  Tests:
+    name: Lint Salt's Test Suite
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      run: |
+        apt-get update
+        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+
+    - uses: actions/checkout@v2
+
+    - name: Set Python Version Env Var
+      run: |
+        echo PY_VERSION=$(python -c 'import sys; print("{}.{}".format(*sys.version_info))') >> $GITHUB_ENV
+
+    - name: Install Nox
+      run: |
+        python -m pip install --upgrade pip
+        pip install nox
+
+    - name: Set Lint Python Cache Key
+      run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+
+    - name: Setup Nox Cache
+      uses: pat-s/always-upload-cache@v2.1.3
+      with:
+        path: .nox/
+        key: lint-tests|${{ env.PY }}|${{ hashFiles(format('requirements/static/ci/py{0}/*.txt', env.PY_VERSION)) }}
+
+    - id: changed-files
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          tests:
+            - added|modified:
+              - tests/**/*.py
+
+    - name: Install Python Requirements
+      env:
+        PIP_EXTRA_INDEX_URL: https://artifactory.saltstack.net/artifactory/api/pypi/pypi-open/simple/
+      run:
+        nox --install-only --forcecolor -e lint-tests
+
+    - name: Lint Changed Files
+      if: github.event_name == 'pull_request' && steps.changed-files.outputs.tests == 'true'
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e lint-tests -- ${{ join(fromJSON(steps.changed-files.outputs.tests_files), ' ') }}
+
+    - name: Lint ALL Files
+      if: steps.changed-files.outputs.tests == 'true'
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e lint-tests

.github/workflows/pre-commit.yml

@@ -0,0 +1,55 @@
+name: Pre-Commit
+
+on: [push, pull_request]
+
+jobs:
+  Pre-Commit:
+    name: Run Pre-Commit Against Salt
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      run: |
+        apt-get update
+        apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+
+    - uses: actions/checkout@v2
+
+    - name: Set Pre-Commit Cache Key
+      run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+
+    - name: Setup Pre-Commit Cache
+      uses: pat-s/always-upload-cache@v2.1.3
+      with:
+        path: ~/.cache/pre-commit
+        key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+
+    - id: changed-files
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          repo:
+            - added|modified:
+              - '**'
+
+    - name: Check ALL Files On Branch
+      uses: pre-commit/action@v2.0.0
+      if: github.event_name != 'pull_request'
+      env:
+        SKIP: lint-salt,lint-tests,pyupgrade,remove-import-headers,rstcheck
+
+    - name: Check Changed Files On PR
+      uses: pre-commit/action@v2.0.0
+      if: github.event_name == 'pull_request' && steps.changed-files.outputs.repo == 'true'
+      with:
+        extra_args: --files ${{ join(fromJSON(steps.changed-files.outputs.repo_files), ' ') }}
+      env:
+        SKIP: lint-salt,lint-tests

.pre-commit-config.yaml

@@ -1184,7 +1184,7 @@ repos:
       - id: nox
         alias: check-filemap
         name: Check Filename Map Change Matching
-        files: ^tests/filename_map\.yml$
+        files: ^tests/(filename_map\.yml|.*\.py)$
         pass_filenames: false
         args:
           - -e

CHANGELOG.md

@@ -7,6 +7,44 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+Salt 3002.2 (2020-11-16)
+========================
+
+Fixed
+-----
+
+- Change dict check to isinstance instead of type() for key_values in file.keyvalue. (#57758)
+- Fail when func_ret is False when using the new module.run syntax. (#57768)
+- Fix comparison of certificate values (#58296)
+- When using ssh_pre_flight if there is a failure, fail on retcode not stderr. (#58439)
+- Fix use of unauthd cached vmware service instance (#58691)
+- Removing use of undefined varilable in utils/slack.py. (#58753)
+- Restored the ability to specify the amount of extents for a Logical
+  Volume as a percentage. (#58759)
+- Ensuring that the version check function is run a second time in all the user related functions incase the user being managed is the connection user and the password has been updated. (#58773)
+- Allow bytes in gpg renderer (#58794)
+- Fix issue where win_wua module fails to load when BITS is set to Manual (#58848)
+- Ensure that elasticsearch.index_exists is available before loading the elasticsearch returner. (#58851)
+- Log a different object when debugging if we're using disk cache vs memory cache. The disk cache pillar class has the dict object but the cache pillar object which is used with the memory cache does not include a _dict obeject because it is a dict already. (#58861)
+- Do not generate grains for every job run on Windows minions. This makes Windows
+  conform more to the way posix OSes work today. (#58904)
+- Fixes salt-ssh authentication when using tty (#58922)
+- Revert LazyLoader finalizer. Removed the weakref.finalizer code. On some occasions, the finalized would run when trying to load a new module, firing a race condition. (#58947)
+
+
+Salt 3002.1 (2020-10-26)
+========================
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)
+- Properly validate eauth credentials and tokens along with their ACLs.
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)
+
 Salt 3002 (2020-10-19)
 ======================
 
@@ -45,7 +83,6 @@ Changed
   arguments. ``formatter`` is still supported, but using both ``serializer`` and
   ``formatter`` will cause the state to fail. (#57858)
 
-
 Fixed
 -----
 
@@ -236,6 +273,33 @@ Added
   This flag will be deprecated in the Phosphorus release when this functionality
   becomes the default. (#58652)
 
+Salt 3001.4
+===========
+
+Fixed
+-----
+
+- Fixes salt-ssh authentication when using tty (#58922)
+
+Salt 3001.3
+===========
+
+Fixed
+-----
+
+- Properly validate eauth credentials and tokens along with their ACLs.
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)
+
+Salt 3001.2
+===========
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)
 
 Salt 3001.1 (2020-07-27)
 ========================
@@ -663,8 +727,34 @@ Added
 - [#56637](https://github.com/saltstack/salt/pull/56637) - Add ``win_wua.installed`` to the ``win_wua`` execution module
 - Clarify how to get the master fingerprint (#54699)
 
+Salt 3000.6
+===========
+
+Fixed
+-----
+
+- Fixes salt-ssh authentication when using tty (#58922)
+
+Salt 3000.5
+===========
+
+Fixed
+-----
+
+- Properly validate eauth credentials and tokens along with their ACLs.
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)
+
+Salt 3000.4
+===========
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)
 
-## 3000.1
 ### 3000.3
 
 ### Fixed

changelog/57880.added

@@ -0,0 +1 @@
+CPU model, topology and NUMA node tuning

changelog/58439.fixed

@@ -1 +0,0 @@
-When using ssh_pre_flight if there is a failure, fail on retcode not stderr.

changelog/58589.added

@@ -0,0 +1 @@
+Allow handling special first boot definition on virtual machine

changelog/58753.fixed

@@ -1 +0,0 @@
-Removing use of undefined varilable in utils/slack.py.

changelog/58773.fixed

@@ -1 +0,0 @@
-Ensuring that the version check function is run a second time in all the user related functions incase the user being managed is the connection user and the password has been updated.

changelog/58844.added

@@ -0,0 +1 @@
+Enhance console and serial support in virt module

changelog/58883.fixed

@@ -0,0 +1 @@
+Fixing unhold in yumpkg. Removing unnecessary code and relying on the code that handles dicts later. Adding tests when pkg.installed is called with hold=False.

changelog/58976.fixed

@@ -0,0 +1 @@
+When we are checking requisites, run reconcile_procs just on those requisite states not all running states.

changelog/58991.fixed

@@ -0,0 +1 @@
+Fixing the two failing tests when running on Photon OS. Python 3 installed on Photon OS does not support MD4 hashing, so don't load pdbedit module and skip the test_generate_nt_hash test. Default unmask for files and directories results in them having only user and group permissions so update the test_directory_max_depth test.

changelog/59069.fixed

@@ -0,0 +1,2 @@
+Fixed an error when running svn.latest in test mode and using the trust_failures
+option.

cicd/jenkins/kitchen-fedora31-py3 → cicd/jenkins/kitchen-fedora33-py3

@@ -1,10 +1,10 @@
 @Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-014e0bc5fd36130a6',
+    ami_image_id: 'ami-0f325553c2ef49ecf',
     concurrent_builds: 1,
     distro_name: 'fedora',
-    distro_version: '31',
+    distro_version: '33',
     env: env,
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',

cicd/jenkins/kitchen-fedora31-py3-pytest → cicd/jenkins/kitchen-fedora33-py3-pytest

@@ -1,10 +1,10 @@
 @Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-014e0bc5fd36130a6',
+    ami_image_id: 'ami-0f325553c2ef49ecf',
     concurrent_builds: 1,
     distro_name: 'fedora',
-    distro_version: '31',
+    distro_version: '33',
     env: env,
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',

cicd/jenkins/kitchen-freebsd121-py3

@@ -1,17 +0,0 @@
-@Library('salt@master-1.9') _
-
-runTestSuite(
-    ami_image_id: 'ami-07e12cf8c3e2dc24d',
-    concurrent_builds: 1,
-    distro_name: 'freebsd',
-    distro_version: '121',
-    env: env,
-    golden_images_branch: 'master',
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'runtests-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true)
-
-// vim: ft=groovy

cicd/jenkins/kitchen-freebsd121-py3-pytest

@@ -1,20 +0,0 @@
-@Library('salt@master-1.9') _
-
-runTestSuite(
-    ami_image_id: 'ami-07e12cf8c3e2dc24d',
-    concurrent_builds: 1,
-    distro_name: 'freebsd',
-    distro_version: '121',
-    env: env,
-    golden_images_branch: 'master',
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    //splits: ['unit', 'integration', 'multimaster'],
-    testrun_timeout: 6,
-    use_spot_instances: true,
-    //fast_slow_staged_testrun: true
-)
-
-// vim: ft=groovy

cicd/jenkins/kitchen-macosxhighsierra-py3

@@ -1,19 +0,0 @@
-@Library('salt@master-1.9') _
-
-// Pre-nox pipeline
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'macosx',
-    distro_version: 'highsierra',
-    env: env,
-    golden_images_branch: 'master',
-    jenkins_slave_label: 'kitchen-slave-mac',
-    kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml',
-    nox_env_name: 'runtests-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    run_full: params.runFull,
-    testrun_timeout: 6,
-    use_spot_instances: false)
-
-// vim: ft=groovy

cicd/jenkins/kitchen-macosxhighsierra-py3-pytest

@@ -1,21 +0,0 @@
-@Library('salt@master-1.9') _
-
-// Pre-nox pipeline
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'macosx',
-    distro_version: 'highsierra',
-    env: env,
-    golden_images_branch: 'master',
-    jenkins_slave_label: 'kitchen-slave-mac',
-    kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-nox-platforms.yml',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    //splits: ['unit', 'integration', 'multimaster'],
-    testrun_timeout: 6,
-    use_spot_instances: false,
-    //fast_slow_staged_testrun: true
-)
-
-// vim: ft=groovy

conf/minion

@@ -530,11 +530,14 @@
 # enabled and can be disabled by changing this value to False.
 #clean_dynamic_modules: True
 #
-# Normally, the minion is not isolated to any single environment on the master
+# Renamed from ``environment`` to ``saltenv``. If ``environment`` is used,
+# ``saltenv`` will take its value. If both are used, ``environment`` will be
+# ignored and ``saltenv`` will be used.
+# Normally the minion is not isolated to any single environment on the master
 # when running states, but the environment can be isolated on the minion side
 # by statically setting it. Remember that the recommended way to manage
 # environments is to isolate via the top file.
-#environment: None
+#saltenv: None
 #
 # Isolates the pillar environment on the minion side. This functions the same
 # as the environment setting, but for pillar instead of states.

doc/_incl/requisite_incl.rst

@@ -4,7 +4,6 @@ following the :ref:`installation` and the
 
 .. admonition:: Stuck?
 
-    There are many ways to :ref:`get help from the Salt community
-    <salt-community>` including our
+    There are many ways to :ref:`salt-community` including our
     `mailing list <https://groups.google.com/forum/#!forum/salt-users>`_
-    and our `IRC channel <https://webchat.freenode.net/#salt>`_ #salt.
+    and our `IRC channel <https://webchat.freenode.net/#salt>`_ #salt.

doc/contents.rst

@@ -8,6 +8,7 @@ Salt Table of Contents
     :maxdepth: 2
 
     topics/index
+    topics/salt_system_architecture
     topics/installation/index
     topics/configuration/index
     topics/using_salt

doc/man/salt-api.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-API" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .

doc/man/salt-call.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-CALL" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .

doc/man/salt-cloud.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-CLOUD" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .

doc/man/salt-cp.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-CP" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .

doc/man/salt-key.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-KEY" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .

doc/man/salt-master.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-MASTER" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .

doc/man/salt-minion.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-MINION" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .

doc/man/salt-proxy.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-PROXY" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .

doc/man/salt-run.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-RUN" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-RUN" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .

doc/man/salt-ssh.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SSH" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-SSH" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .

doc/man/salt-syndic.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SYNDIC" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-SYNDIC" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .

doc/man/salt-unity.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-UNITY" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT-UNITY" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt-unity \- salt-unity Command
 .

doc/man/salt.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SALT" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 salt \- salt
 .

doc/man/spm.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SPM" "1" "Oct 05, 2020" "3002" "Salt"
+.TH "SPM" "1" "Nov 14, 2020" "3002.2" "Salt"
 .SH NAME
 spm \- Salt Package Manager Command
 .

doc/ref/beacons/all/index.rst

@@ -21,6 +21,7 @@ beacon modules
     haproxy
     inotify
     journald
+    junos_rre_keys
     load
     log_beacon
     memusage

doc/ref/beacons/all/salt.beacons.junos_rre_keys.rst

@@ -0,0 +1,5 @@
+salt.beacons.junos_rre_keys module
+====================================
+
+.. automodule:: salt.beacons.junos_rre_keys
+    :members:

doc/ref/configuration/master.rst

@@ -2525,18 +2525,20 @@ states is cluttering the logs. Set it to True to ignore them.
 
 Default: ``False``
 
-Automatically aggregate all states that have support for mod_aggregate by
-setting to ``True``. Or pass a list of state module names to automatically
-aggregate just those types.
+Automatically aggregate all states that have support for ``mod_aggregate`` by
+setting to ``True``.
 
 .. code-block:: yaml
 
-    state_aggregate:
-      - pkg
+    state_aggregate: True
+
+Or pass a list of state module names to automatically
+aggregate just those types.
 
 .. code-block:: yaml
 
-    state_aggregate: True
+    state_aggregate:
+      - pkg
 
 .. conf_master:: state_events
 

doc/ref/configuration/minion.rst

@@ -103,6 +103,16 @@ The option can also be set to a list of masters, enabling
           - address2
         master_type: failover
 
+.. conf_minion:: color
+
+``color``
+---------
+
+Default: ``True``
+
+By default output is colored. To disable colored output, set the color value to
+``False``.
+
 .. conf_minion:: ipv6
 
 ``ipv6``
@@ -2179,6 +2189,28 @@ or just post what changes are going to be made.
 
     test: False
 
+.. conf_minion:: state_aggregate
+
+``state_aggregate``
+-------------------
+
+Default: ``False``
+
+Automatically aggregate all states that have support for ``mod_aggregate`` by
+setting to ``True``.
+
+.. code-block:: yaml
+
+    state_aggregate: True
+
+Or pass a list of state module names to automatically
+aggregate just those types.
+
+.. code-block:: yaml
+
+    state_aggregate:
+      - pkg
+
 .. conf_minion:: state_verbose
 
 ``state_verbose``

doc/security/index.rst

@@ -114,8 +114,20 @@ quickly and safely as is possible.
     lists. The announcement contains a description of the issue and a link to
     the full release documentation and download locations.
 
+.. _saltstack_security_announcements:
+
 Receiving security announcements
 ================================
 
-The fastest place to receive security announcements is via the `salt-announce`_
-mailing list. This list is low-traffic.
+The following mailing lists, per the previous tasks identified in our response
+procedure, will receive security-relevant notifications:
+
+* `salt-packagers`_
+* `salt-users`_
+* `salt-announce`_
+
+In addition to the mailing lists, SaltStack also provides the following resources:
+
+* `SaltStack Security Announcements <https://www.saltstack.com/security-announcements/>`__ landing page
+* `SaltStack Security RSS Feed <http://www.saltstack.com/feed/?post_type=security>`__
+* `SaltStack Community Slack Workspace <http://saltstackcommunity.slack.com/>`__

doc/topics/development/contributing.rst

@@ -250,6 +250,19 @@ Fork a Repo Guide_>`_ and is well worth reading.
         non-fast-forward issue, will likely add extra commits to the pull
         request which were not part of your changes.
 
+#.  Check `Github Actions`_ status on your fork
+
+    By now, and in case you haven't disabled `Github Actions`_, you should have at least 3
+    workflows running on your fork.
+
+      #. ``Pre-Commit`` - The pre-commit checks salt uses to validate several parts of its codebase
+      #. ``Docs`` - Builds Salt's Documentation
+      #. ``Lint`` - Runs lint checks agraint the salt codebase
+
+    Go to https://github.com/my-account/salt/actions to check them out.
+    These will give you an early warning in case something is not right, giving you a chance to fix
+    them even before you open a pull request against the Salt repository.
+
 #.  Find the branch on your GitHub salt fork.
 
     https://github.com/my-account/salt/branches/fix-broken-thing
@@ -468,3 +481,4 @@ Script, see the Bootstrap Script's `Contributing Guidelines`_.
 .. _`#salt on freenode`: https://webchat.freenode.net/#salt
 .. _`saltstack meetup`: https://www.meetup.com/pro/saltstack/
 .. _`saltstack on serverfault`: https://serverfault.com/questions/tagged/saltstack
+.. _`Github Actions`: https://docs.github.com/actions

doc/topics/development/conventions/style.rst

@@ -18,31 +18,21 @@ to treat others without respect, especially people working to improve Salt)!
 Linting
 =======
 
-Most Salt style conventions are codified in Salt's ``.testing.pylintrc`` file.
-Salt's pylint file has two dependencies: pylint_ and saltpylint_. You can
-install these dependencies with ``pip``:
+Most Salt style conventions are codified in Salt's ``.pylintrc`` file.
+Salt's pylint file has two dependencies: pylint_ and saltpylint_, however, linting should
+be done using :ref:`nox <getting_set_up_for_tests>`.
 
 .. code-block:: bash
 
-    pip install pylint
-    pip install saltpylint
+   nox -e lint
 
-The ``.testing.pylintrc`` file is found in the root of the Salt project and can
-be passed as an argument to the pylint_ program as follows:
+One can target either salt's source code or the test suite(different pylint rules apply):
 
 .. code-block:: bash
 
-    pylint --rcfile=/path/to/salt/.testing.pylintrc salt/dir/to/lint
+   nox -e lint-salt
+   nox -e lint-tests
 
-.. note::
-
-    There are two pylint files in the ``salt`` directory. One is the
-    ``.pylintrc`` file and the other is the ``.testing.pylintrc`` file. The
-    tests that run in Jenkins against GitHub Pull Requests use
-    ``.testing.pylintrc``. The ``testing.pylintrc`` file is a little less
-    strict than the ``.pylintrc`` and is used to make it easier for contributors
-    to submit changes. The ``.pylintrc`` file can be used for linting, but the
-    ``testing.pylintrc`` is the source of truth when submitting pull requests.
 
 .. _pylint: https://www.pylint.org/
 .. _saltpylint: https://github.com/saltstack/salt-pylint
@@ -66,15 +56,23 @@ Formatting Strings
 
 All strings which require formatting should use the `.format` string method:
 
+Please do NOT use printf formatting, unless it's a log message.
+
+Good:
+
 .. code-block:: python
 
     data = "some text"
-    more = "{0} and then some".format(data)
+    more = "{} and then some".format(data)
+    log.debug("%s and then some", data)
 
-Make sure to use indices or identifiers in the format brackets, since empty
-brackets are not supported by python 2.6.
+Bad:
+
+.. code-block:: python
+
+    data = "some text"
+    log.debug("{} and then some".format(data))
 
-Please do NOT use printf formatting.
 
 Docstring Conventions
 ---------------------

doc/topics/hardening.rst

@@ -10,6 +10,11 @@ heavily on how you use Salt, where you use Salt, how your team is structured,
 where you get data from, and what kinds of access (internal and external) you
 require.
 
+.. important::
+
+    Refer to the :ref:`saltstack_security_announcements` documentation in order to stay updated
+    and secure.
+
 .. warning::
 
     For historical reasons, Salt requires PyCrypto as a "lowest common
@@ -43,7 +48,8 @@ Salt hardening tips
 ===================
 
 - Subscribe to `salt-users`_ or `salt-announce`_ so you know when new Salt
-  releases are available. Keep your systems up-to-date with the latest patches.
+  releases are available.
+- Keep your systems up-to-date with the latest patches.
 - Use Salt's Client :ref:`ACL system <acl>` to avoid having to give out root
   access in order to run Salt commands.
 - Use Salt's Client :ref:`ACL system <acl>` to restrict which users can run what commands.

doc/topics/index.rst

@@ -1,3 +1,5 @@
+.. _`Apache 2.0 license`: http://www.apache.org/licenses/LICENSE-2.0.html
+
 ====================
 Introduction to Salt
 ====================

doc/topics/releases/2019.2.6.rst

@@ -0,0 +1,13 @@
+.. _release-2019-2-6:
+
+===========================
+Salt 2019.2.6 Release Notes
+===========================
+
+Version 2019.2.6 is a CVE fix release for :ref:`2019.2.0 <release-2019-2-0>`.
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)

doc/topics/releases/2019.2.7.rst

@@ -0,0 +1,15 @@
+.. _release-2019-2-7:
+
+===========================
+Salt 2019.2.7 Release Notes
+===========================
+
+Version 2019.2.7 is a CVE fix release for :ref:`2019.2.0 <release-2019-2-0>`.
+
+Fixed
+-----
+
+- Properly validate eauth credentials and tokens along with their ACLs. 
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)

doc/topics/releases/2019.2.8.rst

@@ -0,0 +1,13 @@
+.. _release-2019-2-8:
+
+===========================
+Salt 2019.2.8 Release Notes
+===========================
+
+Version 2019.2.8 is a bugfix release for :ref:`2019.2.0 <release-2019-2-0>`.
+
+Fixed
+-----
+
+- Fixes salt-ssh authentication when using tty (#58922)
+

doc/topics/releases/3000.4.rst

@@ -0,0 +1,13 @@
+.. _release-3000-4:
+
+=========================
+Salt 3000.4 Release Notes
+=========================
+
+Version 3000.4 is a CVE fix release for :ref:`3000 <release-3000>`.
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)

doc/topics/releases/3000.5.rst

@@ -0,0 +1,15 @@
+.. _release-3000-5:
+
+=========================
+Salt 3000.5 Release Notes
+=========================
+
+Version 3000.5 is a CVE fix release for :ref:`3000 <release-3000>`.
+
+Fixed
+-----
+
+- Properly validate eauth credentials and tokens along with their ACLs. 
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)

doc/topics/releases/3000.6.rst

@@ -0,0 +1,13 @@
+.. _release-3000-6:
+
+=========================
+Salt 3000.6 Release Notes
+=========================
+
+Version 3000.6 is a bugfix release for :ref:`3000 <release-3000>`.
+
+Fixed
+-----
+
+- Fixes salt-ssh authentication when using tty (#58922)
+

doc/topics/releases/3001.2.rst

@@ -0,0 +1,13 @@
+.. _release-3001-2:
+
+=========================
+Salt 3001.2 Release Notes
+=========================
+
+Version 3001.2 is a CVE fix release for :ref:`3001 <release-3001>`.
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)

doc/topics/releases/3001.3.rst

@@ -0,0 +1,15 @@
+.. _release-3001-3:
+
+=========================
+Salt 3001.3 Release Notes
+=========================
+
+Version 3001.3 is a CVE fix release for :ref:`3001 <release-3001>`.
+
+Fixed
+-----
+
+- Properly validate eauth credentials and tokens along with their ACLs.
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)

doc/topics/releases/3001.4.rst

@@ -0,0 +1,13 @@
+.. _release-3001-4:
+
+=========================
+Salt 3001.4 Release Notes
+=========================
+
+Version 3001.4 is a bugfix release for :ref:`3001 <release-3001>`.
+
+Fixed
+-----
+
+- Fixes salt-ssh authentication when using tty (#58922)
+

doc/topics/releases/3002.1.rst

@@ -0,0 +1,17 @@
+.. _release-3002-1:
+
+=========================
+Salt 3002.1 Release Notes
+=========================
+
+Version 3002.1 is a CVE fix release for :ref:`3002 <release-3002>`.
+
+Fixed
+-----
+
+- Prevent shell injections in netapi ssh client (cve-2020-16846)
+- Prevent creating world readable private keys with the tls execution module. (cve-2020-17490)
+- Properly validate eauth credentials and tokens along with their ACLs. 
+  Prior to this change eauth was not properly validated when calling
+  Salt ssh via the salt-api. Any value for 'eauth' or 'token' would allow a user
+  to bypass authentication and make calls to Salt ssh. (CVE-2020-25592)

doc/topics/releases/3002.2.rst

@@ -0,0 +1,28 @@
+.. _release-3002-2:
+
+=========================
+Salt 3002.2 Release Notes
+=========================
+
+Version 3002.2 is a bugfix release for :ref:`3002 <release-3002>`.
+
+Fixed
+-----
+
+- Change dict check to isinstance instead of type() for key_values in file.keyvalue. (#57758)
+- Fail when func_ret is False when using the new module.run syntax. (#57768)
+- Fix comparison of certificate values (#58296)
+- When using ssh_pre_flight if there is a failure, fail on retcode not stderr. (#58439)
+- Fix use of unauthd cached vmware service instance (#58691)
+- Removing use of undefined varilable in utils/slack.py. (#58753)
+- Restored the ability to specify the amount of extents for a Logical
+  Volume as a percentage. (#58759)
+- Ensuring that the version check function is run a second time in all the user related functions incase the user being managed is the connection user and the password has been updated. (#58773)
+- Allow bytes in gpg renderer (#58794)
+- Fix issue where win_wua module fails to load when BITS is set to Manual (#58848)
+- Ensure that elasticsearch.index_exists is available before loading the elasticsearch returner. (#58851)
+- Log a different object when debugging if we're using disk cache vs memory cache. The disk cache pillar class has the dict object but the cache pillar object which is used with the memory cache does not include a _dict obeject because it is a dict already. (#58861)
+- Do not generate grains for every job run on Windows minions. This makes Windows
+  conform more to the way posix OSes work today. (#58904)
+- Fixes salt-ssh authentication when using tty (#58922)
+- Revert LazyLoader finalizer. Removed the weakref.finalizer code. On some occasions, the finalized would run when trying to load a new module, firing a race condition. (#58947)

doc/topics/releases/3003.rst

@@ -0,0 +1,8 @@
+.. _release-3003:
+
+============================================
+Salt 3003 Release Notes - Codename Aluminium
+============================================
+
+Salt 3003 is an *unreleased* upcoming feature release.
+

doc/topics/releases/index.rst

@@ -41,7 +41,7 @@ Upcoming Release
     :maxdepth: 1
     :glob:
 
-    3002*
+    3003*
 
 .. seealso:: :ref:`Legacy salt-cloud release docs <legacy-salt-cloud-release-notes>`
 

doc/topics/salt_system_architecture.rst

@@ -0,0 +1,277 @@
+.. _salt-system-architecture:
+
+========================
+Salt system architecture
+========================
+
+Overview
+========
+This page provides a high-level overview of the Salt system architecture and its
+different components.
+
+
+What is Salt?
+=============
+Salt is a Python-based open-source remote execution framework used for:
+
+* Configuration management
+* Automation
+* Provisioning
+* Orchestration
+
+
+The Salt system architecture
+============================
+The following diagram shows the primary components of the basic Salt
+architecture:
+
+.. image:: /_static/salt-architecture.png
+    :width: 80%
+
+The following sections describe some of the core components of the Salt
+architecture.
+
+
+Salt Masters and Salt Minions
+-----------------------------
+Salt uses the master-client model in which a master issues commands to a client
+and the client executes the command. In the Salt ecosystem, the Salt Master is a
+server that is running the ``salt-master`` service. It issues commands to one or
+more Salt Minions, which are servers that are running the ``salt-minion``
+service and that are registered with that particular Salt Master.
+
+Another way to describe Salt is as a publisher-subscriber model. The master
+publishes jobs that need to be executed and Salt Minions subscribe to those
+jobs. When a specific job applies to that minion, it will execute the job.
+
+When a minion finishes executing a job, it sends job return data back to the
+master. Salt has two ports used by default for the minions to communicate with
+their master(s). These ports work in concert to receive and deliver data to the
+Message Bus. Salt’s message bus is ZeroMQ, which creates an asynchronous network
+topology to provide the fastest communication possible.
+
+
+Targets and grains
+------------------
+The master indicates which minions should execute the job by defining a
+*target*. A target is the group of minions, across one or many masters, that a
+job's Salt command applies to.
+
+.. Note::
+    A master can also be managed like a minion and can be a target if it is
+    running the ``salt-minion`` service.
+
+The following is an example of one of the many kinds of commands that a master
+might issue to a minion. This command indicates that all minions should install
+the Vim application:
+
+.. code-block:: bash
+
+    salt -v '*' pkg.install vim
+
+In this case the glob ``'*'`` is the target, which indicates that all minions
+should execute this command. Many other targeting options are available,
+including targeting a specific minion by its ID or targeting minions by their
+shared traits or characteristics (called *grains* in Salt).
+
+Salt comes with an interface to derive information about the underlying system.
+This is called the *grains interface*, because it presents Salt with grains of
+information. Grains are collected for the operating system, domain name,
+IP address, kernel, OS type, memory, and many other system properties. You can
+also create your own custom grain data.
+
+Grain data is relatively static. However, grain data is refreshed when system
+information changes (such as network settings) or when a new value is assigned
+to a custom grain.
+
+
+Open event system (event bus)
+-----------------------------
+The event system is used for inter-process communication between the Salt Master
+and Salt Minions. In the event system:
+
+* Events are seen by both the master and minions.
+* Events can be monitored and evaluated by both.
+
+The event bus lays the groundwork for orchestration and real-time monitoring.
+
+All minions see jobs and results by subscribing to events published on the event
+system. Salt uses a pluggable event system with two layers:
+
+* **ZeroMQ (0MQ)** - The current default socket-level library providing a
+  flexible transport layer.
+* **Tornado** - Full TCP-based transport layer event system.
+
+One of the greatest strengths of Salt is the speed of execution. The event
+system’s communication bus is more efficient than running a higher-level web
+service (http). The remote execution system is the component that all components
+are built upon, allowing for decentralized remote execution to spread load
+across resources.
+
+
+Salt states
+-----------
+In addition to remote execution, Salt provides another method for configuring
+minions by declaring which *state* a minion should be in, otherwise referred to
+as *Salt states*. Salt states make configuration management possible. You can
+use Salt states to deploy and manage infrastructure with simple YAML files.
+Using states, you can automate recursive and predictable tasks by queueing jobs
+for Salt to implement without needing user input. You can also add more complex
+conditional logic to state files with Jinja.
+
+To illustrate the subtle differences between remote execution and configuration
+management, take the command referenced in the previous section about
+`Targets and grains`_ in which Salt installed the application Vim on all
+minions:
+
+.. list-table::
+  :widths: 25 25 50
+  :header-rows: 1
+
+  * - Methodology
+    - Implementation
+    - Result
+
+  * - Remote execution
+    - * Run ``salt -v '*' pkg.install vim`` from the terminal
+    - * Remotely installs Vim on the targeted minions
+
+  * - Configuration management
+    - * Write a YAML state file that checks whether Vim is installed
+      * This state file is then applied to the targeted minions
+    - * Ensures that Vim is always installed on the targeted minions
+      * Salt analyzes the state file and determines what actions need to be
+        taken to ensure the minion complies with the state declarations
+      * If Vim is not installed, it automates the processes to install Vim on
+        the targeted minions
+
+The state file that verifies Vim is installed might look like the following
+example:
+
+.. code-block:: yaml
+
+    # File:/srv/salt/vim_install.sls
+
+    install_vim_now:
+      pkg.installed:
+        - pkgs:
+          - vim
+
+To apply this state to a minion, you would use the ``state.apply`` module, such
+as in the following example:
+
+.. code-block:: bash
+
+    salt '*' state.apply vim_install
+
+This command applies the ``vim_install`` state to all minions.
+
+*Formulas* are collections of states that work in harmony to configure a minion
+or application. For example, one state might trigger another state.
+
+
+The Top file
+------------
+It is not practical to manually run each state individually targeting specific
+minions each time. Some environments have hundreds of state files targeting
+thousands of minions.
+
+Salt offers two features to help with this scaling problem:
+
+* **The top.sls file** - Maps Salt states to their applicable minions.
+* **Highstate execution** - Runs all Salt states outlined in ``top.sls`` in a
+  single execution.
+
+The top file maps which states should be applied to different minions in certain
+environments. The following is an example of a simple top file:
+
+.. code-block:: yaml
+
+    # File: /srv/salt/top.sls
+
+    base:
+      '*':
+        - all_server_setup
+
+      '01webserver':
+        - web_server_setup
+
+In this example, ``base`` refers to the Salt environment, which is the default.
+You can specify more than one environment as needed, such as prod, dev, QA, etc.
+
+Groups of minions are specified under the environment, and states are listed for
+each set of minions. This top file indicates that a state called
+``all_server_setup`` should be applied to all minions ``'*'`` and the state
+called ``web_server_setup`` should be applied to the ``01webserver`` minion.
+
+To run the Salt command, you would use the state.highstate function:
+
+.. code-block:: bash
+
+    salt \* state.highstate
+
+This command applies the top file to the targeted minions.
+
+
+Salt pillar
+-----------
+Salt’s pillar feature takes data defined on the Salt Master and distributes it
+to minions as needed. Pillar is primarily used to store secrets or other highly
+sensitive data, such as account credentials, cryptographic keys, or passwords.
+Pillar is also useful for storing non-secret data that you don't want to place
+directly in your state files, such as configuration data.
+
+Salt pillar brings data into the cluster from the opposite direction as grains.
+While grains are data generated from the minion, the pillar is data generated
+from the master.
+
+Pillars are organized similarly to states in a Pillar state tree, where
+``top.sls`` acts to coordinate pillar data to environments and minions privy to
+the data. Information transferred using pillar has a dictionary generated for
+the targeted minion and encrypted with that minion’s key for secure data
+transfer. Pillar data is encrypted on a per-minion basis, which makes it useful
+for storing sensitive data specific to a particular minion.
+
+
+Beacons and reactors
+--------------------
+The beacon system is a monitoring tool that can listen for a variety of system
+processes on Salt Minions. Beacons can trigger reactors which can then help
+implement a change or troubleshoot an issue. For example, if a service’s
+response times out, the reactor system can restart the service.
+
+Beacons are used for a variety of purposes, including:
+
+* Automated reporting
+* Error log delivery
+* Microservice monitoring
+* User shell activity
+* Resource monitoring
+
+When coupled with reactors, beacons can create automated pre-written responses
+to infrastructure and application issues. Reactors expand Salt with automated
+responses using pre-written remediation states.
+
+Reactors can be applied in a variety of scenarios:
+
+* Infrastructure scaling
+* Notifying administrators
+* Restarting failed applications
+* Automatic rollback
+
+When both beacons and reactors are used together , you can create unique states
+customized to your specific needs.
+
+
+Salt runners and orchestration
+------------------------------
+Salt runners are convenience applications executed with the ``salt-run``
+command. Salt runners work similarly to Salt execution modules. However, they
+execute on the Salt Master instead of the Salt Minions. A Salt runner can be a
+simple client call or a complex application.
+
+Salt provides the ability to orchestrate system administrative tasks throughout
+the enterprise. Orchestration makes it possible to coordinate the activities of
+multiple machines from a central place. It has the added advantage of being able
+to control the sequence of when certain configuration events occur.
+Orchestration states execute on the master using the state runner module.

doc/topics/ssh/roster.rst

@@ -69,6 +69,7 @@ The information which can be stored in a roster ``target`` is the following:
         set_path:    # Set the path environment variable, to ensure the expected python
                      # binary is in the salt-ssh path, when running the command.
                      # Example: '$PATH:/usr/local/bin/'. Added in 3001 Release.
+        ssh_options: # List of options (as 'option=argument') to pass to ssh.
 
 
 .. _ssh_pre_flight:

requirements/base.txt

@@ -4,3 +4,4 @@ PyYAML
 MarkupSafe
 requests>=1.0.0
 distro>=1.5
+contextvars; python_version < '3.7'

requirements/pytest.txt

@@ -2,6 +2,6 @@ mock >= 3.0.0
 # PyTest
 pytest >= 6.1.0
 pytest-salt
-pytest-salt-factories >= 0.93.0
+pytest-salt-factories >= 0.99.0
 pytest-tempdir >= 2019.10.12
 pytest-helpers-namespace >= 2019.1.8

requirements/static/ci/linux.in

@@ -25,7 +25,8 @@ passlib
 paramiko>=2.1.6
 pycurl
 pygit2<=0.28.2; python_version < '3.8'
-pygit2>=1.2.0; python_version >= '3.8'
+pygit2<1.1.0; python_version == '3.8'
+pygit2>=1.2.0; python_version >= '3.9'
 pyiface
 pyinotify
 python-etcd>0.4.2

requirements/static/ci/py3.5/cloud.txt

@@ -4,11 +4,10 @@
 #
 #    pip-compile -o requirements/static/ci/py3.5/cloud.txt -v requirements/static/ci/cloud.in
 #
-asn1crypto==0.24.0        # via cryptography
 certifi==2019.3.9         # via requests
 cffi==1.12.2              # via cryptography
 chardet==3.0.4            # via requests
-cryptography==2.6.1       # via requests-ntlm, smbprotocol
+cryptography==3.2.1       # via requests-ntlm, smbprotocol
 idna==2.8                 # via requests
 netaddr==0.7.19
 ntlm-auth==1.3.0          # via requests-ntlm, smbprotocol

requirements/static/ci/py3.5/darwin.txt

@@ -7,8 +7,8 @@
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
-asn1crypto==1.3.0
-attrs==19.1.0             # via pytest
+asn1crypto==1.3.0         # via certvalidator, oscrypto
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 bcrypt==3.1.6             # via paramiko
@@ -27,8 +27,9 @@ cherrypy==17.4.1
 click==7.0                # via geomet
 clustershell==1.8.1
 contextlib2==0.6.0.post1
+contextvars==2.4 ; python_version < "3.7"
 croniter==0.3.29
-cryptography==2.6.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -44,6 +45,7 @@ gitdb2==2.0.6
 gitpython==2.1.15
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.3.1  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -89,10 +91,10 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -100,7 +102,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.5/freebsd.txt

@@ -8,7 +8,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
@@ -26,8 +26,9 @@ cheetah3==3.1.0
 cheroot==6.5.4
 cherrypy==17.3.0
 contextlib2==0.5.5
+contextvars==2.4 ; python_version < "3.7"
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -43,6 +44,7 @@ gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 hgtools==8.1.1
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.5.0  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -91,10 +93,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -102,7 +104,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.5/linux.txt

@@ -9,7 +9,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
 azure-batch==4.1.3        # via azure
@@ -110,8 +110,9 @@ cheroot==6.5.4
 cherrypy==17.3.0
 click==7.1.1              # via geomet
 contextlib2==0.5.5
+contextvars==2.4 ; python_version < "3.7"
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -128,6 +129,7 @@ gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 hgtools==8.1.1
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.5.0  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -184,10 +186,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -195,7 +197,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests-oauthlib==1.3.0  # via msrest
 requests==2.21.0
 responses==0.10.6         # via moto

requirements/static/ci/py3.5/windows.txt

@@ -5,9 +5,8 @@
 #    pip-compile -o requirements/static/ci/py3.5/windows.txt -v requirements/static/pkg/py3.5/windows.txt requirements/pytest.txt requirements/static/ci/windows.in
 #
 appdirs==1.4.4            # via virtualenv
-asn1crypto==1.3.0
 atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 boto3==1.13.5
@@ -24,7 +23,8 @@ cherrypy==17.4.1
 click==7.1.2              # via geomet
 colorama==0.4.1           # via pytest
 contextlib2==0.6.0.post1
-cryptography==2.6.1
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dmidecode==0.9.0
@@ -41,6 +41,7 @@ gitdb2==2.0.5
 gitpython==2.1.10
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.5.0  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -83,10 +84,10 @@ pymysql==0.9.3
 pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4

requirements/static/ci/py3.6/cloud.txt

@@ -4,11 +4,10 @@
 #
 #    pip-compile -o requirements/static/ci/py3.6/cloud.txt -v requirements/static/ci/cloud.in
 #
-asn1crypto==0.24.0        # via cryptography
 certifi==2019.3.9         # via requests
 cffi==1.12.2              # via cryptography
 chardet==3.0.4            # via requests
-cryptography==2.6.1       # via requests-ntlm, smbprotocol
+cryptography==3.2.1       # via requests-ntlm, smbprotocol
 idna==2.8                 # via requests
 netaddr==0.7.19
 ntlm-auth==1.3.0          # via requests-ntlm, smbprotocol

requirements/static/ci/py3.6/darwin.txt

@@ -7,8 +7,8 @@
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
-asn1crypto==1.3.0
-attrs==19.1.0             # via pytest
+asn1crypto==1.3.0         # via certvalidator, oscrypto
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 bcrypt==3.1.6             # via paramiko
@@ -29,8 +29,9 @@ click==7.0                # via geomet
 clustershell==1.8.1
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.6.0.post1
+contextvars==2.4 ; python_version < "3.7"
 croniter==0.3.29
-cryptography==2.6.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -46,6 +47,7 @@ gitdb2==2.0.6
 gitpython==2.1.15
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.3.1  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -94,10 +96,10 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -105,7 +107,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.6/freebsd.txt

@@ -8,7 +8,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
@@ -28,8 +28,9 @@ cherrypy==17.3.0
 ciscoconfparse==1.5.19    # via napalm
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
+contextvars==2.4 ; python_version < "3.7"
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -45,6 +46,7 @@ gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 hgtools==8.1.1
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.5.0  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -96,10 +98,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -107,7 +109,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.6/linux.txt

@@ -9,7 +9,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
 azure-batch==4.1.3        # via azure
@@ -112,8 +112,9 @@ ciscoconfparse==1.5.19    # via napalm
 click==7.1.1              # via geomet
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
+contextvars==2.4 ; python_version < "3.7"
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -130,6 +131,7 @@ gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 hgtools==8.1.1
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.5.0  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -188,10 +190,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -199,7 +201,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests-oauthlib==1.3.0  # via msrest
 requests==2.21.0
 responses==0.10.6         # via moto

requirements/static/ci/py3.6/windows.txt

@@ -5,9 +5,8 @@
 #    pip-compile -o requirements/static/ci/py3.6/windows.txt -v requirements/static/pkg/py3.6/windows.txt requirements/pytest.txt requirements/static/ci/windows.in
 #
 appdirs==1.4.4            # via virtualenv
-asn1crypto==1.3.0
 atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 boto3==1.13.5
@@ -24,7 +23,8 @@ cherrypy==17.4.1
 click==7.1.2              # via geomet
 colorama==0.4.1           # via pytest
 contextlib2==0.6.0.post1
-cryptography==2.6.1
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dmidecode==0.9.0
@@ -41,6 +41,7 @@ gitdb2==2.0.5
 gitpython==2.1.10
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+immutables==0.14
 importlib-metadata==0.23  # via importlib-resources, pluggy, pytest, virtualenv
 importlib-resources==1.5.0  # via virtualenv
 iniconfig==1.0.1          # via pytest
@@ -82,10 +83,10 @@ pymysql==0.9.3
 pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4

requirements/static/ci/py3.7/cloud.txt

@@ -4,11 +4,10 @@
 #
 #    pip-compile -o requirements/static/ci/py3.7/cloud.txt -v requirements/static/ci/cloud.in
 #
-asn1crypto==0.24.0        # via cryptography
 certifi==2019.3.9         # via requests
 cffi==1.12.2              # via cryptography
 chardet==3.0.4            # via requests
-cryptography==2.6.1       # via requests-ntlm, smbprotocol
+cryptography==3.2.1       # via requests-ntlm, smbprotocol
 idna==2.8                 # via requests
 netaddr==0.7.19
 ntlm-auth==1.3.0          # via requests-ntlm, smbprotocol

requirements/static/ci/py3.7/darwin.txt

@@ -7,8 +7,8 @@
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
-asn1crypto==1.3.0
-attrs==19.1.0             # via pytest
+asn1crypto==1.3.0         # via certvalidator, oscrypto
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
@@ -29,7 +29,7 @@ clustershell==1.8.1
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.6.0.post1
 croniter==0.3.29
-cryptography==2.6.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -92,10 +92,10 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -103,7 +103,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.7/freebsd.txt

@@ -8,7 +8,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5
 bcrypt==3.1.6             # via paramiko
@@ -28,7 +28,7 @@ ciscoconfparse==1.5.19    # via napalm
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -94,10 +94,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -105,7 +105,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.7/linux.txt

@@ -9,7 +9,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
 azure-batch==4.1.3        # via azure
@@ -112,7 +112,7 @@ click==7.1.1              # via geomet
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -186,10 +186,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -197,7 +197,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests-oauthlib==1.3.0  # via msrest
 requests==2.21.0
 responses==0.10.6         # via moto

requirements/static/ci/py3.7/windows.txt

@@ -5,9 +5,8 @@
 #    pip-compile -o requirements/static/ci/py3.7/windows.txt -v requirements/static/pkg/py3.7/windows.txt requirements/pytest.txt requirements/static/ci/windows.in
 #
 appdirs==1.4.4            # via virtualenv
-asn1crypto==1.3.0
 atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 boto3==1.13.5
 boto==2.49.0
@@ -23,7 +22,7 @@ cherrypy==17.4.1
 click==7.1.2              # via geomet
 colorama==0.4.1           # via pytest
 contextlib2==0.6.0.post1
-cryptography==2.6.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dmidecode==0.9.0
@@ -80,10 +79,10 @@ pymysql==0.9.3
 pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4

requirements/static/ci/py3.8/cloud.txt

@@ -4,11 +4,10 @@
 #
 #    pip-compile -o requirements/static/ci/py3.8/cloud.txt -v requirements/static/ci/cloud.in
 #
-asn1crypto==0.24.0        # via cryptography
 certifi==2019.3.9         # via requests
 cffi==1.12.2              # via cryptography
 chardet==3.0.4            # via requests
-cryptography==2.6.1       # via requests-ntlm, smbprotocol
+cryptography==3.2.1       # via requests-ntlm, smbprotocol
 idna==2.8                 # via requests
 netaddr==0.7.19
 ntlm-auth==1.3.0          # via requests-ntlm, smbprotocol

requirements/static/ci/py3.8/darwin.txt

@@ -7,8 +7,8 @@
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
-asn1crypto==1.3.0
-attrs==19.1.0             # via pytest
+asn1crypto==1.3.0         # via certvalidator, oscrypto
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
@@ -29,7 +29,7 @@ clustershell==1.8.1
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.6.0.post1
 croniter==0.3.29
-cryptography==2.6.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -91,10 +91,10 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -102,7 +102,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==19.0.0
+pyzmq==19.0.0 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.8/freebsd.txt

@@ -8,7 +8,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5
 bcrypt==3.1.6             # via paramiko
@@ -28,7 +28,7 @@ ciscoconfparse==1.5.19    # via napalm
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -93,10 +93,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -104,7 +104,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==19.0.0
+pyzmq==19.0.0 ; python_version < "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.8/linux.txt

@@ -9,7 +9,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
 azure-batch==4.1.3        # via azure
@@ -98,7 +98,6 @@ bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
 boto==2.49.0
 botocore==1.16.26         # via boto3, moto, s3transfer
-cached-property==1.5.1    # via pygit2
 cachetools==3.1.0         # via google-auth
 cassandra-driver==3.23.0
 certifi==2020.6.20
@@ -113,7 +112,7 @@ click==7.1.1              # via geomet
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -177,7 +176,7 @@ pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.8
 pycurl==7.43.0.6
 pyeapi==0.8.3             # via napalm
-pygit2==1.2.0 ; python_version >= "3.8"
+pygit2==1.0.3 ; python_version == "3.8"
 pyiface==0.0.11
 pyinotify==0.9.6
 pyjwt==1.7.1              # via adal
@@ -186,10 +185,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -197,7 +196,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==19.0.0
+pyzmq==19.0.0 ; python_version < "3.9"
 requests-oauthlib==1.3.0  # via msrest
 requests==2.21.0
 responses==0.10.6         # via moto

requirements/static/ci/py3.9/cloud.txt

@@ -4,11 +4,10 @@
 #
 #    pip-compile -o requirements/static/ci/py3.9/cloud.txt -v requirements/static/ci/cloud.in
 #
-asn1crypto==0.24.0        # via cryptography
 certifi==2019.3.9         # via requests
-cffi==1.12.2              # via cryptography
+cffi==1.14.3              # via cryptography
 chardet==3.0.4            # via requests
-cryptography==2.6.1       # via requests-ntlm, smbprotocol
+cryptography==3.2.1       # via requests-ntlm, smbprotocol
 idna==2.8                 # via requests
 netaddr==0.7.19
 ntlm-auth==1.3.0          # via requests-ntlm, smbprotocol

requirements/static/ci/py3.9/darwin.txt

@@ -7,8 +7,8 @@
 apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
-asn1crypto==1.3.0
-attrs==19.1.0             # via pytest
+asn1crypto==1.3.0         # via certvalidator, oscrypto
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 bcrypt==3.1.6             # via paramiko
 boto3==1.13.5
@@ -18,7 +18,7 @@ cachetools==3.1.0         # via google-auth
 cassandra-driver==3.23.0
 certifi==2020.6.20
 certvalidator==0.11.1     # via vcert
-cffi==1.12.2
+cffi==1.14.3
 chardet==3.0.4
 cheetah3==3.1.0
 cheroot==8.3.0
@@ -29,7 +29,7 @@ clustershell==1.8.1
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.6.0.post1
 croniter==0.3.29
-cryptography==2.6.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -91,10 +91,10 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -102,7 +102,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==19.0.0
+pyzmq==19.0.2 ; python_version >= "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.9/freebsd.txt

@@ -8,7 +8,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5
 bcrypt==3.1.6             # via paramiko
@@ -28,7 +28,7 @@ ciscoconfparse==1.5.19    # via napalm
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -93,10 +93,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -104,7 +104,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==19.0.0
+pyzmq==19.0.2 ; python_version >= "3.9"
 requests==2.21.0
 responses==0.10.6         # via moto
 rfc3987==1.3.8

requirements/static/ci/py3.9/linux.txt

@@ -9,7 +9,7 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, oscrypto
-attrs==19.1.0             # via pytest
+attrs==20.3.0             # via pytest, pytest-salt-factories
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
 azure-batch==4.1.3        # via azure
@@ -113,7 +113,7 @@ click==7.1.1              # via geomet
 colorama==0.4.3           # via ciscoconfparse
 contextlib2==0.5.5
 croniter==0.3.29
-cryptography==3.1.1
+cryptography==3.2
 distlib==0.3.0            # via virtualenv
 distro==1.5.0
 dnspython==1.16.0
@@ -145,7 +145,7 @@ kazoo==2.6.1
 keyring==5.7.1
 kubernetes==3.0.0
 libnacl==1.7.1
-lxml==4.3.3               # via junos-eznc, napalm, ncclient
+lxml==4.5.2               # via junos-eznc, napalm, ncclient
 mako==1.1.0
 markupsafe==1.1.1
 mock==3.0.5
@@ -177,7 +177,7 @@ pycryptodome==3.8.1       # via python-jose
 pycryptodomex==3.9.8
 pycurl==7.43.0.6
 pyeapi==0.8.3             # via napalm
-pygit2==1.2.0 ; python_version >= "3.8"
+pygit2==1.2.0 ; python_version >= "3.9"
 pyiface==0.0.11
 pyinotify==0.9.6
 pyjwt==1.7.1              # via adal
@@ -186,10 +186,10 @@ pyopenssl==19.1.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.93.0
+pytest-salt-factories==0.99.0
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==6.1.1
+pytest==6.1.2
 python-dateutil==2.8.1
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -197,7 +197,7 @@ python-jose==2.0.2        # via moto
 pytz==2020.1
 pyvmomi==6.7.1.2018.12
 pyyaml==5.3.1
-pyzmq==19.0.0
+pyzmq==19.0.2 ; python_version >= "3.9"
 requests-oauthlib==1.3.0  # via msrest
 requests==2.21.0
 responses==0.10.6         # via moto

requirements/static/pkg/py3.5/darwin.txt

@@ -5,7 +5,6 @@
 #    pip-compile -o requirements/static/pkg/py3.5/darwin.txt -v pkg/osx/req_pyobjc.txt requirements/darwin.txt requirements/static/pkg/darwin.in
 #
 apache-libcloud==2.4.0
-asn1crypto==1.3.0         # via cryptography
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 certifi==2020.6.20        # via requests
 cffi==1.12.2              # via cryptography
@@ -13,11 +12,13 @@ chardet==3.0.4            # via requests
 cheroot==8.3.0            # via cherrypy
 cherrypy==17.4.1
 contextlib2==0.6.0.post1  # via cherrypy
-cryptography==2.6.1
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2
 distro==1.5.0
 gitdb2==2.0.6             # via gitpython
 gitpython==2.1.15
 idna==2.8
+immutables==0.14          # via contextvars
 ipaddress==1.0.22
 jaraco.functools==2.0     # via cheroot, tempora
 jinja2==2.10.1
@@ -36,7 +37,7 @@ python-dateutil==2.8.0
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.5/freebsd.txt

@@ -12,9 +12,11 @@ chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
-cryptography==3.1.1       # via pyopenssl
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2         # via pyopenssl
 distro==1.5.0
 idna==2.8                 # via requests
+immutables==0.14          # via contextvars
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
 markupsafe==1.1.1
@@ -29,7 +31,7 @@ python-dateutil==2.8.1
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, more-itertools, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.5/linux.txt

@@ -12,9 +12,11 @@ chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
-cryptography==3.1.1       # via pyopenssl
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2         # via pyopenssl
 distro==1.5.0
 idna==2.8                 # via requests
+immutables==0.14          # via contextvars
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
 markupsafe==1.1.1
@@ -29,7 +31,7 @@ python-dateutil==2.8.1
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, more-itertools, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.5/windows.txt

@@ -4,7 +4,6 @@
 #
 #    pip-compile -o requirements/static/pkg/py3.5/windows.txt -v requirements/windows.txt requirements/static/pkg/windows.in
 #
-asn1crypto==1.3.0         # via cryptography
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 certifi==2020.6.20
 cffi==1.12.2
@@ -12,11 +11,13 @@ chardet==3.0.4            # via requests
 cheroot==8.3.0            # via cherrypy
 cherrypy==17.4.1
 contextlib2==0.6.0.post1  # via cherrypy
-cryptography==2.6.1
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2
 distro==1.5.0
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.10
 idna==2.8
+immutables==0.14          # via contextvars
 ioloop==0.1a0
 ipaddress==1.0.22
 jaraco.functools==2.0     # via cheroot, tempora

requirements/static/pkg/py3.6/darwin.txt

@@ -5,7 +5,6 @@
 #    pip-compile -o requirements/static/pkg/py3.6/darwin.txt -v pkg/osx/req_pyobjc.txt requirements/darwin.txt requirements/static/pkg/darwin.in
 #
 apache-libcloud==2.4.0
-asn1crypto==1.3.0         # via cryptography
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 certifi==2020.6.20        # via requests
 cffi==1.12.2              # via cryptography
@@ -13,11 +12,13 @@ chardet==3.0.4            # via requests
 cheroot==8.3.0            # via cherrypy
 cherrypy==17.4.1
 contextlib2==0.6.0.post1  # via cherrypy
-cryptography==2.6.1
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2
 distro==1.5.0
 gitdb2==2.0.6             # via gitpython
 gitpython==2.1.15
 idna==2.8
+immutables==0.14          # via contextvars
 ipaddress==1.0.22
 jaraco.functools==2.0     # via cheroot, tempora
 jinja2==2.10.1
@@ -36,7 +37,7 @@ python-dateutil==2.8.0
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.6/freebsd.txt

@@ -12,9 +12,11 @@ chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
-cryptography==3.1.1       # via pyopenssl
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2         # via pyopenssl
 distro==1.5.0
 idna==2.8                 # via requests
+immutables==0.14          # via contextvars
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
 markupsafe==1.1.1
@@ -29,7 +31,7 @@ python-dateutil==2.8.1
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, more-itertools, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.6/linux.txt

@@ -12,9 +12,11 @@ chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
-cryptography==3.1.1       # via pyopenssl
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2         # via pyopenssl
 distro==1.5.0
 idna==2.8                 # via requests
+immutables==0.14          # via contextvars
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
 markupsafe==1.1.1
@@ -29,7 +31,7 @@ python-dateutil==2.8.1
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, more-itertools, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.6/windows.txt

@@ -4,7 +4,6 @@
 #
 #    pip-compile -o requirements/static/pkg/py3.6/windows.txt -v requirements/windows.txt requirements/static/pkg/windows.in
 #
-asn1crypto==1.3.0         # via cryptography
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
 certifi==2020.6.20
 cffi==1.12.2
@@ -12,11 +11,13 @@ chardet==3.0.4            # via requests
 cheroot==8.3.0            # via cherrypy
 cherrypy==17.4.1
 contextlib2==0.6.0.post1  # via cherrypy
-cryptography==2.6.1
+contextvars==2.4 ; python_version < "3.7"
+cryptography==3.2
 distro==1.5.0
 gitdb2==2.0.5             # via gitpython
 gitpython==2.1.10
 idna==2.8
+immutables==0.14          # via contextvars
 ioloop==0.1a0
 ipaddress==1.0.22
 jaraco.functools==2.0     # via cheroot, tempora

requirements/static/pkg/py3.7/darwin.txt

@@ -5,14 +5,13 @@
 #    pip-compile -o requirements/static/pkg/py3.7/darwin.txt -v pkg/osx/req_pyobjc.txt requirements/darwin.txt requirements/static/pkg/darwin.in
 #
 apache-libcloud==2.4.0
-asn1crypto==1.3.0         # via cryptography
 certifi==2020.6.20        # via requests
 cffi==1.12.2              # via cryptography
 chardet==3.0.4            # via requests
 cheroot==8.3.0            # via cherrypy
 cherrypy==17.4.1
 contextlib2==0.6.0.post1  # via cherrypy
-cryptography==2.6.1
+cryptography==3.2
 distro==1.5.0
 gitdb2==2.0.6             # via gitpython
 gitpython==2.1.15
@@ -35,7 +34,7 @@ python-dateutil==2.8.0
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, pyopenssl, python-dateutil, tempora

requirements/static/pkg/py3.7/freebsd.txt

@@ -11,7 +11,7 @@ chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
-cryptography==3.1.1       # via pyopenssl
+cryptography==3.2         # via pyopenssl
 distro==1.5.0
 idna==2.8                 # via requests
 jaraco.functools==2.0     # via tempora
@@ -28,7 +28,7 @@ python-dateutil==2.8.1
 python-gnupg==0.4.4
 pytz==2020.1              # via tempora
 pyyaml==5.3.1
-pyzmq==18.0.1
+pyzmq==18.0.1 ; python_version < "3.9"
 requests==2.21.0
 setproctitle==1.1.10
 six==1.15.0               # via cheroot, cherrypy, cryptography, more-itertools, pyopenssl, python-dateutil, tempora