Test

1 files changed, 19 insertions, 29 deletions

diff --git a/server/composer.lock b/server/composer.lock
index 6ab8a7f..7d11e49 100755
--- a/server/composer.lock
+++ b/server/composer.lock
@@ -4,21 +4,21 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7647ed348aee68f2db6b71e4d2fb1fe7",
-    "content-hash": "82731500d050a65f09e92b70c1f96ea9",
+    "hash": "e7cbd5d3df36fb1a3f3378b837068196",
+    "content-hash": "125e4702f7a417475a4150c889ac6c3d",
     "packages": [
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.1.1",
+            "version": "6.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
+                "reference": "d094e337976dff9d8e2424e8485872194e768662"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
-                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
+                "reference": "d094e337976dff9d8e2424e8485872194e768662",
                 "shasum": ""
             },
             "require": {
@@ -34,7 +34,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.1-dev"
+                    "dev-master": "6.2-dev"
                 }
             },
             "autoload": {
@@ -67,7 +67,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2015-11-23 00:47:50"
+            "time": "2016-03-21 20:02:09"
         },
         {
             "name": "guzzlehttp/promises",
@@ -246,16 +246,16 @@
         },
         {
             "name": "php-opencloud/common",
-            "version": "dev-master",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-opencloud/common.git",
-                "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62"
+                "reference": "4a4aec0a4f35b471570271dd1a2e52667dee62b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-opencloud/common/zipball/fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62",
-                "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62",
+                "url": "https://api.github.com/repos/php-opencloud/common/zipball/4a4aec0a4f35b471570271dd1a2e52667dee62b8",
+                "reference": "4a4aec0a4f35b471570271dd1a2e52667dee62b8",
                 "shasum": ""
             },
             "require": {
@@ -287,7 +287,7 @@
                     "homepage": "https://github.com/jamiehannaford"
                 }
             ],
-            "time": "2016-03-08 12:56:34"
+            "time": "2016-03-18 13:45:42"
         },
         {
             "name": "php-opencloud/openstack",
@@ -295,25 +295,16 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-opencloud/openstack.git",
-                "reference": "f2ee77024843659d970817a9e7055bb40a3724f9"
+                "reference": "61626420361a1dab3ed6f9455e1057bda18cc335"
             },
             "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
+                "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/61626420361a1dab3ed6f9455e1057bda18cc335",
+                "reference": "61626420361a1dab3ed6f9455e1057bda18cc335",
                 "shasum": ""
             },
             "require": {
-                "php-opencloud/common": "dev-master"
+                "php-opencloud/common": "~1.0"
             },
             "require-dev": {
                 "fabpot/php-cs-fixer": "~1.0",
@@ -337,7 +328,7 @@
                     "homepage": "https://github.com/jamiehannaford"
                 }
             ],
-            "time": "2016-03-08 14:37:14"
+            "time": "2016-03-20 10:57:06"
         },
         {
             "name": "psr/http-message",
@@ -393,8 +384,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "php-opencloud/openstack": 20,
-        "php-opencloud/common": 20
+        "php-opencloud/openstack": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,