GitLab

Rc3.0

See merge request !1

Merge pull request #580 in MEL/upperware from bugfix/MEL-1120-jms-credentials-missing-in-dlms to rc3.0

* commit '045ba955':
  latency utility in case of one element in range - fixed NaN
  credentials for connection from dlms-agent to activeMQ in ems

Merge pull request #573 in MEL/upperware from bugfix/MEL-1120-jms-credentials-missing-in-dlms to rc3.0

* commit '50126487':
  credentials for connection from dlms to activeMQ in ems

* commit '6769e5c8':
  Changes committed with accordance to comments in PR #544
  All changes with regard to MEL-976 task - adding network latency metric support

* commit 'd224ff42':
  fixes after review
  fixes after review
  support for the reconfiguration time attribute in the utility generator
  hack: sending reconfiguration time instead of reconfiguration penalty in UG

* a future fix will instead perform a conditional retry

Change-Id: Ifc3e2f379dce3ead1ae8c823bff86fb19e7084ba

Change-Id: I3e4d0e99d1330f6d5d438c26e37749d81f0ae8f6

Merge pull request #539 in MEL/upperware from feature/MEL-1067-new-endpoint-in-cpsolver-constraintproblemsolutionfromfile to rc3.0

* commit 'e35693f8':
  Fixes after comments
  small fix (removed debug code)
  Fully implemented adapter endpoint constraintProblemSolutionFromFile. Changed reading POST body according to changes in their implementation in integration (under the same MEL-1067 task). Added areYouThere endpoint which was created for testing and may be useful in further development (e.g. during configuration).

* commit '35aa46d3': (22 commits)
  deleted useless imports
  changed string formats and imports
  information about simulation in Camunda variables
  release
  Revert "poms updated"
  poms updated
  poms updated
  changed response message from string to responseStatusErrors
  first version of error handling in metasolver
  logs changed
  added result field to getMetricNames response
  fixed naming
  added applicationId to getMetricNames enpoint. small changes inside simulateReconfiguration endpoint. Renames.
  readded token to getMetricNames,
  deleted watermark in simulateMetricValues. added service, controller etc. for this endpoint inside Gui-Backend
  deleted authorization for getMetricNames inside MS, added for gui-backend coressponding service, controller, apiClient
  poms for bamboo pushing
  working version, changed names, logs, added field metricNames inside MetaSolver and isSimulation flag inside rescaling process request
  updaated Communicaion in the old version
  updaated Communicaion in the old version
  ...

Merge pull request #538 in MEL/upperware from bugfix/MEL-1087-unable-to-build-adapter-unitenum to rc3.0

* commit 'c87db6f5':
  changes for new Cloudiator model in rest-server

Merge branch 'MEL-989-multicloud-optimizer-simulatorV2' of https://bitbucket.7bulls.eu/scm/mel/upperware into MEL-989-multicloud-optimizer-simulatorV2

* commit 'c3c67a84':
  EMS - Removed dummy.txt

This reverts commit 89efcdad

added applicationId to getMetricNames enpoint. small changes inside simulateReconfiguration endpoint. Renames.

deleted watermark in simulateMetricValues. added service, controller etc. for this endpoint inside Gui-Backend