Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 20 deletions

diff --git a/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php b/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
deleted file mode 100755
index d367600..0000000
--- a/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace OpenCloud\Integration;
-
-use Psr\Log\AbstractLogger;
-
-class DefaultLogger extends AbstractLogger
-{
-    public function log($level, $message, array $context = [])
-    {
-        echo $this->format($level, $message, $context);
-    }
-
-    private function format($level, $message, $context)
-    {
-        $msg = strtr($message, $context);
-
-        return sprintf("%s: %s\n", strtoupper($level), $msg);
-    }
-}