Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 16 deletions

diff --git a/server/vendor/php-opencloud/common/tests/integration/TestInterface.php b/server/vendor/php-opencloud/common/tests/integration/TestInterface.php
deleted file mode 100755
index 418b407..0000000
--- a/server/vendor/php-opencloud/common/tests/integration/TestInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace OpenCloud\Integration;
-
-use Psr\Log\LoggerInterface;
-
-interface TestInterface
-{
-    public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager);
-
-    public function runTests();
-
-    public function runOneTest($name);
-
-    public function teardown();
-}