Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use packaged json module for ThreadsafeProxy #55660

Merged
merged 3 commits into from
Dec 19, 2019
Merged

Use packaged json module for ThreadsafeProxy #55660

merged 3 commits into from
Dec 19, 2019

Commits on Dec 16, 2019

  1. Use packaged json module for ThreadsafeProxy

    @Akm0d
    Akm0d committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    df5f193 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Do not import json functions directly

    @Akm0d
    Akm0d committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    2e28cd5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/saltstack/salt into use_p… 

    …ackaged_jsonlibs
    @Akm0d
    Akm0d committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    a01f842 View commit details
    Browse the repository at this point in the history