Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop

1 files changed, 72 insertions, 22 deletions

diff --git a/server/composer.lock b/server/composer.lock
index c6598db..6ab8a7f 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",
@@ -71,16 +71,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.0.3",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+                "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
+                "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
                 "shasum": ""
             },
             "require": {
@@ -118,20 +118,20 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2015-10-15 22:28:00"
+            "time": "2016-03-08 01:15:46"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb"
+                "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b",
+                "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b",
                 "shasum": ""
             },
             "require": {
@@ -176,7 +176,7 @@
                 "stream",
                 "uri"
             ],
-            "time": "2016-01-23 01:23:02"
+            "time": "2016-02-18 21:54:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -245,28 +245,79 @@
             "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": {
                 "type": "git",
                 "url": "https://github.com/php-opencloud/openstack.git",
-                "reference": "15aca73f423166c7ef8337ba08615c103c66e931"
+                "reference": "f2ee77024843659d970817a9e7055bb40a3724f9"
             },
             "dist": {
                 "type": "zip",
+<<<<<<< HEAD
+<<<<<<< Updated upstream
                 "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931",
+=======
+                "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9",
+>>>>>>> develop
                 "reference": "15aca73f423166c7ef8337ba08615c103c66e931",
+=======
+                "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9",
+                "reference": "f2ee77024843659d970817a9e7055bb40a3724f9",
+>>>>>>> Stashed changes
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "~6.1",
-                "justinrainbow/json-schema": "~1.3",
-                "php": ">=5.6"
+                "php-opencloud/common": "dev-master"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "~1.0",
                 "jakub-onderka/php-parallel-lint": "0.*",
-                "phpspec/prophecy-phpunit": "~1.0",
                 "phpunit/phpunit": "~4.0",
                 "psr/log": "~1.0",
                 "sami/sami": "dev-master",
@@ -275,9 +326,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "OpenStack\\": "src/",
-                    "OpenStack\\Test\\": "tests/unit/",
-                    "OpenStack\\Integration\\": "tests/integration/"
+                    "OpenStack\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -288,7 +337,7 @@
                     "homepage": "https://github.com/jamiehannaford"
                 }
             ],
-            "time": "2016-01-25 10:35:10"
+            "time": "2016-03-08 14:37:14"
         },
         {
             "name": "psr/http-message",
@@ -344,7 +393,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,