Merge "Use libyaml if possible" into feature/zuulv3

This commit is contained in:
Jenkins
2017-04-06 22:04:48 +00:00
committed by Gerrit Code Review
8 changed files with 39 additions and 7 deletions

View File

@@ -35,13 +35,13 @@ import uuid
import Queue
import gear
import yaml
import jenkins_jobs.builder
import jenkins_jobs.formatter
import zmq
import zuul.ansible.library
from zuul.lib import commandsocket
from zuul.lib import yamlutil as yaml
ANSIBLE_WATCHDOG_GRACE = 5 * 60
ANSIBLE_DEFAULT_TIMEOUT = 2 * 60 * 60

View File

@@ -24,7 +24,7 @@ import tempfile
import threading
import time
import traceback
import yaml
from zuul.lib.yamlutil import yaml
import gear
import git