Merge branch 'master' of https://github.com/openHPI/codeocean

2015-11-25 11:18:18 +01:00
parent 1f25b3558c 201b298941
commit 27d226cbe4
3 changed files with 43 additions and 45 deletions
--- a/lib/docker_container_pool.rb
+++ b/lib/docker_container_pool.rb
@ -1,6 +1,6 @@
 require 'concurrent/future'
 require 'concurrent/timer_task'
-require 'concurrent/utilities'
+

 class DockerContainerPool