Merge branch '2017.7' into fix-cmd-run-env-corrupt

This commit is contained in:
psyer 2018-03-13 15:44:45 -04:00 committed by GitHub
commit 86176d1252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -165,4 +165,6 @@ def start(queue, profile=None, tag='salt/engine/sqs', owner_acct_id=None):
while True:
if not q:
q = sqs.get_queue(queue, owner_acct_id=owner_acct_id)
q.set_message_class(boto.sqs.message.RawMessage)
_process_queue(q, queue, fire_master, tag=tag, owner_acct_id=owner_acct_id, message_format=message_format)