diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-15 16:17:39 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-15 16:17:39 +0100 |
| commit | 26d10bc0fa4befbac54453228ae1ce89021bdec2 (patch) | |
| tree | 029d7240ecf7416205e5f76cf9107a6b5bdf8ca3 /server/composer.lock | |
| parent | 8ad216dedf017f3d6de047a25d08db3b98e16361 (diff) | |
| parent | 03ef74d0cfe675a6e18a91f039182ca1b248d8f5 (diff) | |
Merge branch 'develop' into loic
Diffstat (limited to 'server/composer.lock')
| -rw-r--r-- | server/composer.lock | 54 |
1 files changed, 50 insertions, 4 deletions
diff --git a/server/composer.lock b/server/composer.lock index c6598db..4a9581a 100644 --- a/server/composer.lock +++ b/server/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "e7cbd5d3df36fb1a3f3378b837068196", - "content-hash": "125e4702f7a417475a4150c889ac6c3d", + "hash": "7647ed348aee68f2db6b71e4d2fb1fe7", + "content-hash": "82731500d050a65f09e92b70c1f96ea9", "packages": [ { "name": "guzzlehttp/guzzle", @@ -245,6 +245,51 @@ "time": "2016-01-25 15:43:01" }, { + "name": "php-opencloud/common", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-opencloud/common.git", + "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-opencloud/common/zipball/fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62", + "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~6.1", + "justinrainbow/json-schema": "~1.3", + "php": "~7.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "~1.0", + "jakub-onderka/php-parallel-lint": "0.*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0", + "sami/sami": "dev-master", + "satooshi/php-coveralls": "~1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "OpenCloud\\": "src/", + "OpenCloud\\Test\\": "tests/unit/", + "OpenCloud\\Integration\\": "tests/integration/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "authors": [ + { + "name": "Jamie Hannaford", + "email": "jamie.hannaford@rackspace.com", + "homepage": "https://github.com/jamiehannaford" + } + ], + "time": "2016-03-08 12:56:34" + }, + { "name": "php-opencloud/openstack", "version": "dev-master", "source": { @@ -254,7 +299,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931", + "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9", "reference": "15aca73f423166c7ef8337ba08615c103c66e931", "shasum": "" }, @@ -344,7 +389,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "php-opencloud/openstack": 20 + "php-opencloud/openstack": 20, + "php-opencloud/common": 20 }, "prefer-stable": false, "prefer-lowest": false, |