Commits · proactive-dev-2.5 · Melodic / melodic-upperware

02 Sep, 2022 2 commits
- back to old version of gitlab-ci.yml · eceedcf1
  Jan Marchel authored Sep 02, 2022
  
  eceedcf1
- Merge remote-tracking branch 'origin/morphemic-rc2.5' into proactive-dev-2.5 · 58719ad5
  Jan Marchel authored Sep 02, 2022
```
# Conflicts:
#	adapter/pom.xml
#	cp_generator/pom.xml
#	melodic-commons/pom.xml
#	mq-http-adapter/pom.xml
```
  58719ad5
01 Sep, 2022 1 commit
- Updated alpine java version · 0091d58b
  mriedl authored Sep 01, 2022
  
  0091d58b
04 Aug, 2022 1 commit
- fix for attribute name · 9ee5512d
  Jan Marchel authored Aug 04, 2022
  
  9ee5512d
03 Aug, 2022 1 commit
- setting job id for edge/byon · e7637f86
  Jan Marchel authored Aug 03, 2022
  
  e7637f86
28 Jul, 2022 1 commit
- adding neew · 0a3c2ec2
  Jan Marchel authored Jul 28, 2022
  
  0a3c2ec2
28 Jun, 2022 4 commits
- Merge remote-tracking branch 'remotes/origin/morphemic-rc2.0' into morphemic-rc2.5 · f43d3cd9
  mriedl authored Jun 28, 2022
  
  f43d3cd9
- Merge remote-tracking branch 'remotes/origin/morphemic-rc2.0' into morphemic-rc2.5 · a961940d
  mriedl authored Jun 28, 2022
  
  a961940d
- Merge branch 'mqadapterlogging' into 'morphemic-rc2.0' · f7762a62
  maciek riedl authored Jun 28, 2022
```
Fixed errors in Mq-Adapter, shortened pom, added new Extractor, Changed InstanceInfo extractor

See merge request !141
```
  f7762a62
- Fixed errors in Mq-Adapter, shortened pom, added new Extractor, Changed InstanceInfo extractor · bdc560ef
  mriedl authored Jun 28, 2022
  
  bdc560ef
14 Jun, 2022 1 commit
- fixed always displayed internal exception error meessage · 79b8a578
  mriedl authored Jun 14, 2022
  
  79b8a578
07 Jun, 2022 1 commit
- small fix · 57d7f3a9
  Jan Marchel authored Jun 07, 2022
  
  57d7f3a9
31 May, 2022 2 commits
- integration of ssh key · 069d94dc
  Jan Marchel authored May 31, 2022
  
  069d94dc
- adding placementName attribute · 53416b37
  Jan Marchel authored May 31, 2022
  
  53416b37
30 May, 2022 4 commits
- New fields in new user autogenerated password request · c6e51422
  Jan Marchel authored May 30, 2022
  
  c6e51422
- Merge remote-tracking branch 'origin/proactive-dev-2.5' into proactive-dev-2.5 · 38b285fc
  Jan Marchel authored May 30, 2022
  
  38b285fc
- small changes in user service · 2e93023d
  Jan Marchel authored May 30, 2022
  
  2e93023d
- Merge branch 'ems/morphemic-rc2.5' into 'morphemic-rc2.5' · ba9a60b1
  maciek riedl authored May 30, 2022
```
EMS: Control Service: Fixed pom.xml that failed during CI/CD

See merge request !140
```
  ba9a60b1
29 May, 2022 3 commits
- Revert "EMS: Modified .gitlab-ci.yml to deploy ems-server Docker image from... · 5a057afb
  ipatini authored May 29, 2022
```
Revert "EMS: Modified .gitlab-ci.yml to deploy ems-server Docker image from ems/morphemic-rc2.5 branch [TEMP. CHANGE]"

This reverts commit 5e9b4f2b.
```
  5a057afb
- EMS: Modified .gitlab-ci.yml to deploy ems-server Docker image from... · 5e9b4f2b
  ipatini authored May 29, 2022
```
EMS: Modified .gitlab-ci.yml to deploy ems-server Docker image from ems/morphemic-rc2.5 branch [TEMP. CHANGE]
```
  5e9b4f2b
- EMS: Control Service: Fixed pom.xml that failed during CI/CD at Gitlab · a59e7fb6
  ipatini authored May 29, 2022
  
  a59e7fb6
27 May, 2022 1 commit
- Merge remote-tracking branch 'remotes/origin/morphemic-rc2.0' into morphemic-rc2.5 · 76afff0f
  mriedl authored May 27, 2022
```
# Conflicts:
#	gui-backend/pom.xml
```
  76afff0f
26 May, 2022 2 commits
- Update .gitlab-ci.yml file · 2294953a
  Jan Marchel authored May 26, 2022
  
  2294953a
- Update .gitlab-ci.yml file · cd112bbb
  Jan Marchel authored May 26, 2022
  
  cd112bbb
25 May, 2022 5 commits
- fix creating key for edge · c5eaeb94
  Jan Marchel authored May 25, 2022
  
  c5eaeb94
- adding new constructor for User response · af0f7fe5
  Jan Marchel authored May 25, 2022
  
  af0f7fe5
- adding possibility to change user profile and get username from backend · 54f73051
  Jan Marchel authored May 25, 2022
  
  54f73051
- adding new node candidate type to iaasOrByonOnly · c0f58d5b
  Jan Marchel authored May 25, 2022
  
  c0f58d5b
- Merge branch 'ems/morphemic-rc2.5' into 'morphemic-rc2.5' · 3c947e8a
  maciek riedl authored May 25, 2022
```
EMS: Improvements and bug fixes

See merge request !138
```
  3c947e8a
23 May, 2022 1 commit
- EMS: URGENT: Security Fix for Gson (updated to 2.8.9) · 1736640b
  I Patini authored May 23, 2022
  
  1736640b
20 May, 2022 2 commits
- add new NodeType · 59a8fd99
  Jan Marchel authored May 20, 2022
  
  59a8fd99
- small change for test · eccdcdb3
  Jan Marchel authored May 20, 2022
  
  eccdcdb3
19 May, 2022 1 commit
- adding Node Candidate type Edge and all things related to it · 68602594
  Jan Marchel authored May 19, 2022
  
  68602594
17 May, 2022 2 commits
- Merge branch 'edge-support' into 'proactive-dev-2.5' · 1d234989
  Jan Marchel authored May 17, 2022
```
Edge support

See merge request !137
```
  1d234989
- Merge remote-tracking branch 'origin/proactive-dev-2.5' into edge-support · 1cb0dcc7
  Jan Marchel authored May 17, 2022
```
# Conflicts:
#	adapter/pom.xml
#	cp_generator/pom.xml
#	gui-backend/pom.xml
#	melodic-cache/pom.xml
#	melodic-commons/pom.xml
```
  1cb0dcc7
16 May, 2022 2 commits
- EMS: config: Commented out RL-node limits in eu.melodic.event.baguette-client-install.properties · 1cf12f58
  I Patini authored May 16, 2022
  
  1cf12f58
- EMS: config: Removed an unused setting (and its comment) · 738b39fc
  I Patini authored May 16, 2022
  
  738b39fc
11 May, 2022 1 commit
- Merge branch 'morphemic-rc2.5' into ems/morphemic-rc2.5 · 79a385a1
  ipatini authored May 11, 2022
  
  79a385a1
10 May, 2022 2 commits
- Merge branch 'hotfix-version_of_client' into 'morphemic-rc2.0' · 225536ec
  maciek riedl authored May 10, 2022
```
changing version of client

See merge request !135
```
  225536ec
- changing version of client · b5b47423
  Jan Marchel authored May 10, 2022
  
  b5b47423