Sfoglia il codice sorgente

gitMerge branch 'master' of gitlab.com:interlink-sa/flowdat3/modules/stats into 2

gabriel 6 anni fa
parent
commit
889e823fbc
2 ha cambiato i file con 51 aggiunte e 51 eliminazioni
  1. 10 10
      composer.json
  2. 41 41
      composer.lock

+ 10 - 10
composer.json

@@ -26,35 +26,35 @@
         },
         "1": {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "2": {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "3": {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "4": {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "5": {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
@@ -124,32 +124,32 @@
         },
         "15": {
             "type": "vcs",
-            "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/migrations.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "16": {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git"
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git"
         },
         "17": {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuditBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "18": {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuthBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         "19": {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }

+ 41 - 41
composer.lock

@@ -924,7 +924,7 @@
             "version": "v2.5.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/doctrine2.git",
+                "url": "https://github.com/doctrine/orm.git",
                 "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff"
             },
             "dist": {
@@ -1594,7 +1594,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
-                "reference": "40eba41d6b036daf98dc98c0bfe44e79f1253378"
+                "reference": "34dece40daad7031e332f02314b681bb9ee1cd14"
             },
             "require": {
                 "simplethings/entity-audit-bundle": "^1.0"
@@ -1610,7 +1610,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2018-11-16T17:52:06+00:00"
+            "time": "2019-01-31T13:32:40+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1618,7 +1618,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "f5d0128e028ec87a37de9e7e45e2c3f9ff1f5927"
+                "reference": "c8e77dce32b92c08d75e12c537ead77bf976cd84"
             },
             "type": "library",
             "autoload": {
@@ -1633,7 +1633,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2018-10-01T14:16:36+00:00"
+            "time": "2019-01-31T13:33:33+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1641,7 +1641,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "767b0aad4bd83c5677f69a8bb860793942c90f10"
+                "reference": "a2b2110a69a21e2691266d66e421d2e56dff1c8a"
             },
             "type": "library",
             "autoload": {
@@ -1656,7 +1656,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2019-01-09T17:58:40+00:00"
+            "time": "2019-02-11T17:28:26+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1664,7 +1664,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "2ab9cef5cd82805c9d9c752130213eac485412d1"
+                "reference": "5a72c912f13ba8728fda6792d867e61a889e6c06"
             },
             "type": "library",
             "autoload": {
@@ -1679,7 +1679,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2018-11-16T18:28:19+00:00"
+            "time": "2019-01-31T13:35:09+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1687,7 +1687,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "c85d52d5e306faaa44f9d45353365d00f10adf2d"
+                "reference": "77c2c8228bb9dfd13add559909fd809508b61388"
             },
             "type": "library",
             "autoload": {
@@ -1702,7 +1702,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2018-12-14T11:31:02+00:00"
+            "time": "2019-01-31T13:44:14+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1710,7 +1710,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-                "reference": "5fa33e67613667d93dbaa9e878b38420fe3518a5"
+                "reference": "bcf009e03ace356adfd92a7a89f814aa2e96fb6c"
             },
             "require": {
                 "ext-curl": "*",
@@ -1723,7 +1723,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2018-12-05T12:04:14+00:00"
+            "time": "2019-01-31T13:34:17+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1754,7 +1754,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "1c60fd91f1bb0fe5125da70908670629d4d341e6"
+                "reference": "a057890183bddcb6f4c431c3b7c9afe6839d8d78"
             },
             "require": {
                 "ext-curl": "*",
@@ -1773,7 +1773,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2018-12-04T13:12:24+00:00"
+            "time": "2019-01-31T13:37:25+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1781,7 +1781,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
-                "reference": "9171fd2335cc3d164a97a27f0531e436ef924701"
+                "reference": "ece1ca1df9ca18789ccdcae19a381ee5d9142f6c"
             },
             "type": "library",
             "autoload": {
@@ -1796,7 +1796,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2018-02-19T13:34:58+00:00"
+            "time": "2019-01-31T13:18:32+00:00"
         },
         {
             "name": "ik/redis-bundle",
@@ -1804,7 +1804,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/RedisBundle.git",
-                "reference": "a73973b402e68d7fad48558b91d416acbf5621e6"
+                "reference": "4f4ea5c1f293089713eb4101c078ca5da6f7e8b0"
             },
             "require": {
                 "predis/predis": "^1.1"
@@ -1820,7 +1820,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2018-12-05T18:12:34+00:00"
+            "time": "2019-01-31T11:50:35+00:00"
         },
         {
             "name": "ik/stats/base-stats-bundle",
@@ -1828,7 +1828,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseStatsBundle.git",
-                "reference": "539eb8836bece4767143506ac3636dc2a3f894f1"
+                "reference": "19bb737967c53d84ed114184e3903ae9b8714296"
             },
             "type": "library",
             "autoload": {
@@ -1841,7 +1841,7 @@
                 "BaseStatsBundle",
                 "Flowdat 3"
             ],
-            "time": "2018-07-16T17:55:24+00:00"
+            "time": "2019-01-31T11:49:34+00:00"
         },
         {
             "name": "ik/stats/cmts-bundle",
@@ -1849,7 +1849,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/CmtsBundle.git",
-                "reference": "eab865037405d253c6e50623102e9613db8ef7ca"
+                "reference": "a55d5cdbe5e6e8740e25da342d2c0f371ea257b6"
             },
             "type": "library",
             "autoload": {
@@ -1862,7 +1862,7 @@
                 "CMTS",
                 "Flowdat 3"
             ],
-            "time": "2018-07-24T17:01:41+00:00"
+            "time": "2019-01-31T11:43:41+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1870,7 +1870,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/FiberhomeBundle.git",
-                "reference": "503b10bb58a9ba70cdd9a2b4adb9dd4afc947251"
+                "reference": "705f1ca73b3e3df321d4cae2fb253da1c6bde799"
             },
             "type": "library",
             "autoload": {
@@ -1883,7 +1883,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2018-07-24T17:03:10+00:00"
+            "time": "2019-01-31T11:46:42+00:00"
         },
         {
             "name": "ik/stats/fiberlink-bundle",
@@ -1891,7 +1891,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/FiberlinkBundle.git",
-                "reference": "2a87ff4626e9060af7e32dd9e768f17624d6b0e5"
+                "reference": "cf02d97c7cc7cd85cea396504a7e55a31258535c"
             },
             "type": "library",
             "autoload": {
@@ -1904,7 +1904,7 @@
                 "Fiberlink",
                 "Flowdat 3"
             ],
-            "time": "2018-07-24T17:04:01+00:00"
+            "time": "2019-01-31T11:48:27+00:00"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1912,7 +1912,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/GeoserverBundle.git",
-                "reference": "53061ce8e08150f39c3e3a40dc176affd6c630fe"
+                "reference": "c1888a82f02fbc88ad189f448a19dbb1a4785d52"
             },
             "type": "library",
             "autoload": {
@@ -1925,7 +1925,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2018-06-19T13:48:07+00:00"
+            "time": "2019-01-31T11:52:01+00:00"
         },
         {
             "name": "ik/stats/huawei-bundle",
@@ -1933,7 +1933,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/HuaweiBundle.git",
-                "reference": "45840d567d81ffcdd5c0e747ba4cca863e716c4d"
+                "reference": "8718622404adf5294459610c7207c73f8d02938d"
             },
             "type": "library",
             "autoload": {
@@ -1946,7 +1946,7 @@
                 "Flowdat 3",
                 "Huawei"
             ],
-            "time": "2018-07-26T12:39:33+00:00"
+            "time": "2019-01-31T11:45:59+00:00"
         },
         {
             "name": "ik/stats/nas-bundle",
@@ -1954,7 +1954,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/NasBundle.git",
-                "reference": "7a8869b2c27c4c8e3debb0330e930e93c4e7c596"
+                "reference": "109581df5cd939f2839cbafcfadfdc03f39d3996"
             },
             "type": "library",
             "autoload": {
@@ -1967,7 +1967,7 @@
                 "Flowdat 3",
                 "NAS"
             ],
-            "time": "2018-07-24T17:05:34+00:00"
+            "time": "2019-01-31T11:45:03+00:00"
         },
         {
             "name": "ik/stats/zte-bundle",
@@ -1975,7 +1975,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ZteBundle.git",
-                "reference": "4e227f8f75f22f7ac31d8ba76d2675fff760892d"
+                "reference": "188c90c945252812e4de2f694fb3d47d43455fbe"
             },
             "type": "library",
             "autoload": {
@@ -1988,7 +1988,7 @@
                 "Flowdat 3",
                 "Zte"
             ],
-            "time": "2018-07-24T17:06:24+00:00"
+            "time": "2019-01-31T11:51:13+00:00"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1996,7 +1996,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/StatsDBundle.git",
-                "reference": "c37b89924fc0c18a922fc68739e11b3650a01c5e"
+                "reference": "8abda8acba454af334763d129c343a36d0456803"
             },
             "type": "library",
             "autoload": {
@@ -2009,7 +2009,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2018-08-08T18:36:31+00:00"
+            "time": "2019-01-31T11:52:44+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -2017,7 +2017,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "abe9d7f342d65f89c1e69ddfa2639ddae00eb013"
+                "reference": "68f356b67da08b94cdb7613ad58c5525c88ff950"
             },
             "require": {
                 "ext-curl": "*",
@@ -2030,7 +2030,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2019-01-09T18:31:03+00:00"
+            "time": "2019-01-31T13:36:09+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -2038,7 +2038,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "0359ad6481e2ae8bcff960fabcf17a829093d4c5"
+                "reference": "29bc76615564c555cc3c98cf4c0e27d70b7bfa08"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -2068,7 +2068,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2019-01-09T18:48:20+00:00"
+            "time": "2019-02-06T17:56:50+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",