Merge branch 'master' into travis-green-docker

took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ... We need to shortly discuss this yqbk. Conflicts: lib/docker_client.rb
2016-11-09 18:25:02 +01:00
parent c937a1a9ef b7bced65c5
commit f2db88f952
43 changed files with 1802 additions and 1415 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -419,6 +419,3 @@ DEPENDENCIES
  uglifier (>= 1.3.0)
  web-console (~> 2.0)
  will_paginate (~> 3.0)
-
-BUNDLED WITH
-   1.12.4