Merge branch 'master' of https://bitbucket.org/ikflowdat/stats into FD3-562

Conflicts:
	composer.lock

app/config/parameters.yml.dist

@@ -52,7 +52,7 @@ parameters:
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'
-    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session, flowdat_dhcp_session]
     env(REDIS_HOST): "127.0.0.1" #Hay que borrar y usar HOST_REDIS
     env(HOST_REDIS): "127.0.0.1"
     redis.connection : "tcp://%env(HOST_REDIS)%:6379"

app/config/parameters.yml.docker

@@ -53,7 +53,7 @@ parameters:
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'
-    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session, flowdat_dhcp_session]
     env(REDIS_HOST): "127.0.0.1"
     redis.connection : "tcp://%env(REDIS_HOST)%:6379" 
 

composer.lock

@@ -1530,7 +1530,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "2373f6de17349f1c99a768c4c3a0803df2cc08ca"
+                "reference": "b554fd50c877a46b9f864be768493710a8f25f27"
             },
             "require": {
                 "ext-curl": "*",
@@ -1549,7 +1549,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2018-07-03T12:02:21+00:00"
+            "time": "2018-07-02T17:29:09+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1793,7 +1793,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "3f08376bf0b454e4aa25b8528a55d9540eb26a15"
+                "reference": "2051a376f191c1b72f3a8f2feb875dca03de77fc"
             },
             "require": {
                 "ext-curl": "*",
@@ -1806,7 +1806,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2018-07-03T12:02:52+00:00"
+            "time": "2018-06-07T18:40:05+00:00"
         },
         {
             "name": "ik/workflow-bundle",