merge with master

2016-08-03 12:09:58 +02:00
parent d921f90a65 81b3299917
commit 4183a16178
77 changed files with 770 additions and 515 deletions
--- a/lib/docker_client.rb
+++ b/lib/docker_client.rb
@ -203,7 +203,7 @@ class DockerClient
    execute_command(command, nil, block)
  end

-  #only used by server sent events (deprecated?)
+  #only used by score
  def execute_command(command, before_execution_block, output_consuming_block)
    #tries ||= 0
    @container = DockerContainerPool.get_container(@execution_environment)