Merge remote-tracking branch 'origin/master'

This commit is contained in:
Brad Rydzewski 2014-02-26 00:29:40 -07:00
commit 9161b2ad57

View file

@ -122,7 +122,7 @@ func setupStatic() {
// setup routes for serving dynamic content. // setup routes for serving dynamic content.
func setupHandlers() { func setupHandlers() {
queueRunner := queue.NewRunner(docker.New(), 300*time.Second) queueRunner := queue.NewBuildRunner(docker.New(), 300*time.Second)
queue := queue.Start(runtime.NumCPU(), queueRunner) queue := queue.Start(runtime.NumCPU(), queueRunner)
hookHandler := handler.NewHookHandler(queue) hookHandler := handler.NewHookHandler(queue)