Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 30 deletions

diff --git a/server/vendor/php-opencloud/common/.travis.yml b/server/vendor/php-opencloud/common/.travis.yml
deleted file mode 100755
index f15d253..0000000
--- a/server/vendor/php-opencloud/common/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-matrix:
-  include:
-    - php: 7.0
-    - php: nightly
-  allow_failures:
-    - php: nightly
-  fast_finish: true
-
-before_install:
-  - composer self-update
-
-before_script:
-  - composer install --prefer-source
-  - vendor/bin/parallel-lint --exclude vendor .
-  - vendor/bin/php-cs-fixer fix --dry-run --diff --level psr2 .
-
-after_script:
-  - php vendor/bin/coveralls -v
-
-notifications:
-  email:
-    - jamie.hannaford@rackspace.com