Merge branch 'FD3-241' of bitbucket.org:ikflowdat/ftth

.drone.yml

@@ -50,9 +50,21 @@ pipeline:
    username: drone
    password: 6hd2dLfL
    tag: 
-     - ${DRONE_TAG##v}
      - latest
    when:
      event: [pull_request, push, tag]
-     branch: [master, v*]
+     branch: [master]
+
+ docker_version:
+   repo : docker.infra.flowdat.com/fd3/ftth
+   image: plugins/docker
+   email: luciano@interlink.com.ar
+   registry: docker.infra.flowdat.com
+   username: drone
+   password: 6hd2dLfL
+   tag: 
+     - ${DRONE_TAG##v}
+   when:
+     event: [pull_request, push, tag]
+     branch: [v*]
 

composer.json

@@ -135,8 +135,8 @@
         "ik/oauthclient-bundle": "dev-master",
         "ik/owner-voter-bundle": "dev-master",
         "ik/template-bundle": "dev-master",
-        "ik/webservice-bundle": "dev-workflow_update",
-        "ik/workflow-bundle": "dev-workflow_update",
+        "ik/webservice-bundle": "dev-master",
+        "ik/workflow-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "^2.0",
         "jms/serializer": "^1.9.0",
         "jms/serializer-bundle": "^1.5.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a72cdb6bade67886f26ec3cb1f9494dc",
+    "content-hash": "b6d7257c20b9b3a1be898d53c786d119",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1417,7 +1417,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "54acf731bc43ab49b4d622b0696cb3ab2083576c"
+                "reference": "6aecdaba29efee34b0bc5cbe9c98aa5b894fccdf"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-12T12:03:37+00:00"
+            "time": "2017-10-18T15:40:04+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1625,7 +1625,7 @@
         },
         {
             "name": "ik/webservice-bundle",
-            "version": "dev-workflow_update",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
@@ -1646,11 +1646,11 @@
         },
         {
             "name": "ik/workflow-bundle",
-            "version": "dev-workflow_update",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "d1a52302c4d86dea6b3a39b6100ac03f2b3eb65e"
+                "reference": "d219a26bcfedb81ae53e2ea280d6f9627882a244"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1680,7 +1680,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-10-12T15:00:52+00:00"
+            "time": "2017-10-18T19:00:12+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -6085,7 +6085,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },