Commits · feaf2cbdf461b7b9f27a8ad22754250d4136a02d · Melodic / melodic-integration

24 Jun, 2021 1 commit
- Merge remote-tracking branch 'origin/proactive-dev' into morph-rc15-sync · feaf2cbd
  Marta Różańska authored Jun 24, 2021
```
# Conflicts:
#	connectors/proactive_client/pom.xml
```
  feaf2cbd
23 Jun, 2021 1 commit
- updating version of proactive-client to 1.1 · c5928f7c
  Marta Różańska authored Jun 23, 2021
  
  c5928f7c
16 Jun, 2021 3 commits
- updating version of sal · c819696a
  Marta Różańska authored Jun 16, 2021
  
  c819696a
- Merge branch 'proactive-dev-sync-with-rc15' into 'proactive-dev' · 31d1dd2d
  Marta Różańska authored Jun 16, 2021
```
Removing dependency to cloudiator and mule flows for communication with...

See merge request !18
```
  31d1dd2d
- adding new type of solver: mcts · fc76f9c6
  Marta Różańska authored Jun 16, 2021
  
  fc76f9c6
15 Jun, 2021 2 commits
- Merge branch 'changes_from_proactive_dev_to_merge' into 'morph-rc1.5' · a32a0d4a
  Marta Różańska authored Jun 15, 2021
```
small fixes in gitlab ci

See merge request !17
```
  a32a0d4a
- small fixes in gitlab ci · ff90f335
  marcinbyra authored Jun 15, 2021
  
  ff90f335
14 Jun, 2021 2 commits
- Merge branch 'changes_from_proactive_dev_to_merge' into 'morph-rc1.5' · 4fd414c6
  Marta Różańska authored Jun 14, 2021
```
Changes from proactive dev to merge

See merge request !16
```
  4fd414c6
- small fixes in gitlab ci · b4b1f05f
  marcinbyra authored Jun 14, 2021
  
  b4b1f05f
11 Jun, 2021 2 commits
- changing SAL back to 3.1 · 4286676b
  marcinbyra authored Jun 11, 2021
  
  4286676b
- Merge branch 'proactive-dev' into morph-rc1.5 · 2687e2c4
  marcinbyra authored Jun 11, 2021
  
  2687e2c4
08 Jun, 2021 1 commit
- SAL in 3.2-SNAPSHOT version · ea766e1a
  Jan Marchel authored Jun 08, 2021
  
  ea766e1a
07 Jun, 2021 1 commit
- Merge branch 'removing-communication-with-cloudiator' into 'morph-rc1.5' · 0a540602
  Marta Różańska authored Jun 07, 2021
```
Removing dependency to cloudiator and mule flows for communication with...

See merge request !15
```
  0a540602
04 Jun, 2021 1 commit
- SAL in 3.2-20210602.161936-4 version for test purposes · f0f4c57f
  Jan Marchel authored Jun 04, 2021
  
  f0f4c57f
01 Jun, 2021 3 commits
- Merge branch 'morph-rc1.5' into removing-communication-with-cloudiator · 5d4b5852
  Łukasz Szymański authored Jun 01, 2021
  
  5d4b5852
- addressing MR's thread - removing config "cloudiator_HTTP_Request_Configuration" · 183359cb
  Łukasz Szymański authored Jun 01, 2021
  
  183359cb
- SAL in 3.2-20210601.092039-3 version · c1cb899a
  Jan Marchel authored Jun 01, 2021
  
  c1cb899a
31 May, 2021 1 commit
- SAL in 3.2-SNAPSHOT version · 0d3dc657
  Jan Marchel authored May 31, 2021
  
  0d3dc657
27 May, 2021 1 commit
- Removing dependency to cloudiator and mule flows for communication with... · 95414171
  Łukasz Szymański authored May 28, 2021
```
Removing dependency to cloudiator and mule flows for communication with cloudiator (calling cloudiator's API)
```
  95414171
26 May, 2021 3 commits
- SAL in 3.1-SNAPSHOT version · 187aa357
  Alicja Reniewicz authored May 26, 2021
  
  187aa357
- Merge branch 'morph-rc1.5' into proactive-dev · 8da971d5
  Alicja Reniewicz authored May 26, 2021
  
  8da971d5
- SAL in 3.00 version, upgraded versions of proactive-client to 1.1-SNAPSHOT · 8d9a064b
  Alicja Reniewicz authored May 26, 2021
  
  8d9a064b
20 May, 2021 1 commit
- config for proactive-dev branch · af2661d4
  Alicja Reniewicz authored May 20, 2021
  
  af2661d4
05 May, 2021 2 commits
- morph-rc1.5: build & deploy config for connectors · ab748fdf
  Alicja Reniewicz authored May 05, 2021
  
  ab748fdf
- Merge branch 'feature/proactive_cloud_creation' into 'morph-rc1.5' · 17ead1f6
  Marta Różańska authored May 05, 2021
```
Moving core functionality to connect to Proactive server (ProactiveClientServiceConnector) to connectors/proactive_client module

See merge request !14
```
  17ead1f6
04 May, 2021 3 commits
- changing version of scheduling-abstraction-layer back to 3.00-SNAPSHOT · 97c0d66f
  Łukasz Szymański authored May 05, 2021
  
  97c0d66f
- Merge branch 'morph-rc1.5' into feature/proactive_cloud_creation · b944a0f1
  Łukasz Szymański authored May 05, 2021
  
  b944a0f1
- creating new parent module "connectors" and adding first child module... · 88784339
  Łukasz Szymański authored May 05, 2021
```
creating new parent module "connectors" and adding first child module "proactive_client" that contains moved from melodic-commons core functionality to connect to Proactive server (ProactiveClientServiceConnector)
```
  88784339
30 Apr, 2021 1 commit
- Merge branch 'feature/proactive_cloud_creation' into 'morph-rc1.5' · 735283a3
  Marta Różańska authored Apr 30, 2021
```
Adding functionality to create cloud object (aka node source in proactive)...

See merge request !11
```
  735283a3
29 Apr, 2021 3 commits
- making changes to dependencies because there were problems with classes found... · 9850bde3
  Łukasz Szymański authored Apr 29, 2021
```
making changes to dependencies because there were problems with classes found by Mule class loader on the classpath
```
  9850bde3
- Merge branch 'morph-rc1.5' into feature/proactive_cloud_creation · df3097bf
  Łukasz Szymański authored Apr 29, 2021
  
  df3097bf
- changing to use ProactiveClientServiceConnector abstract class from melodic-commons · d8eca38c
  Łukasz Szymański authored Apr 29, 2021
  
  d8eca38c
21 Apr, 2021 2 commits
- fixed images tag for morph-rc1.5 final · 8240d2d5
  Alicja Reniewicz authored Apr 21, 2021
  
  8240d2d5
- fixed images tag for morph-rc1.5 · c20cbb8b
  Alicja Reniewicz authored Apr 21, 2021
  
  c20cbb8b
16 Apr, 2021 2 commits
- Merge branch 'Dlms_deletion_repairing' into 'morph-rc1.5' · f1da9ae9
  Marta Różańska authored Apr 16, 2021
```
Dlms deletion repairing

See merge request !13
```
  f1da9ae9
- Merge remote-tracking branch 'origin/morph-rc1.5' into Dlms_deletion_repairing · 9bd4ed96
  Jan Marchel authored Apr 16, 2021
```
# Conflicts:
#	.gitlab-ci.yml
```
  9bd4ed96
12 Apr, 2021 4 commits
- fixed problem after merge from morph-rc1.5 · 4016721c
  Alicja Reniewicz authored Apr 12, 2021
  
  4016721c
- merge changes from morph-rc1.5 · dea83164
  Alicja Reniewicz authored Apr 12, 2021
  
  dea83164
- Merge branch 'morph-rc1.5' into feature/proactive_cloud_creation · e5358110
  Alicja Reniewicz authored Apr 12, 2021
```
# Conflicts:
#	mule_esb/mule-integration/.classpath
#	mule_esb/mule-integration/src/main/app/implementation.xml
```
  e5358110
- upgrade version to 4.0.0, updated builds config · 37f6230e
  Alicja Reniewicz authored Apr 12, 2021
  
  37f6230e