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

2015.5 #33611

Merged

cachedout merged 2 commits into saltstack:2015.5 from TargetHolding:2015.5

Jun 2, 2016

rolffokkens commented May 29, 2016

This PR solves 2 issues that appeared while initiating sqlite3 returner usage:

Type in master,py regarding base.exceptions (solved in master already)
A TypeError exception resulting from sqlite3 returner passing improper data

We're succesfully using these patches in our production salt environment.

Rolf Fokkens added 2 commits

May 29, 2016 16:06


          solve AttributeError: 'module' object has no attribute 'exception'

eaf42ca


          solve' TypeError: expected string or buffer' in json/decoder.py

1dd15a6

cachedout merged commit 137f0b1 into saltstack:2015.5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment