Commits · morph-rc1.5 · Melodic / melodic-integration

17 Nov, 2021 2 commits
- Merge branch 'fix_add_clouds' into 'morph-rc1.5' · 5b87eeeb
  Marta Różańska authored Nov 17, 2021
```
Adding new field to cloudJSOn - defaultNetwork

See merge request !32
```
  5b87eeeb
- Adding new field to cloudJSOn - defaultNetwork · 7690aa5f
  Jan Marchel authored Nov 17, 2021
  
  7690aa5f
15 Nov, 2021 2 commits
- Merge branch 'fix_add_clouds' into 'morph-rc1.5' · 1f041272
  Marta Różańska authored Nov 15, 2021
```
Adding functionality to create cloud object (aka node source in proactive)...

See merge request !31
```
  1f041272
- deleting unnecessary fields · 888c9345
  Jan Marchel authored Nov 15, 2021
  
  888c9345
19 Oct, 2021 2 commits
- Merge branch 'openstack_deployment' into 'morph-rc1.5' · 292788e0
  Marta Różańska authored Oct 19, 2021
```
Update .gitlab-ci.yml add parameter to deploy "only: - morphemic-rc2.0" and...

See merge request !29
```
  292788e0
- Update .gitlab-ci.yml add parameter to deploy "only: - morphemic-rc2.0" and... · b9fa9323
  Jan Marchel authored Oct 19, 2021 and Marta Różańska committed Oct 19, 2021
  
  b9fa9323
14 Oct, 2021 2 commits
- Merge branch 'cloudiator-deletion' into 'morph-rc1.5' · 8a4d00a3
  Marta Różańska authored Oct 14, 2021
```
deleted cloudiator dependencies

See merge request !27
```
  8a4d00a3
- deleted cloudiator dependencies · 4831ae90
  maciek riedl authored Oct 14, 2021 and Marta Różańska committed Oct 14, 2021
  
  4831ae90
09 Sep, 2021 1 commit

Merge branch 'proactive-dev' into 'morph-rc1.5' · a0c2a267

Marta Różańska authored Sep 09, 2021

change to check if IAAS nodes are already collected by SAL (BYON nodes are not...

See merge request !26

a0c2a267

31 Aug, 2021 2 commits

Merge branch 'fix/check_only_iaas_nc_update_finished' into 'proactive-dev' · 16dfefa2
Marta Różańska authored Aug 31, 2021
```
change to check if IAAS nodes are already collected by SAL (BYON nodes are not of our interest here)

See merge request !25
```
16dfefa2

change to check if IAAS nodes are already collected by SAL (BYON nodes are not... · a6f4d0cb

Łukasz Szymański authored Aug 31, 2021

change to check if IAAS nodes are already collected by SAL (BYON nodes are not of our interest here) - we want to know if the background process to build NCs for IAAS has finished

a6f4d0cb

28 Jul, 2021 6 commits
- Merge branch 'proactive-dev-tech' into 'proactive-dev' · 71593047
  Marta Różańska authored Jul 28, 2021
```
updating version of proactive client  and connector to 1.5 and SAL to 3.6

See merge request !24
```
  71593047
- updating version of proactive client to 1.5 · 607c4e52
  Tomek Piekarz authored Jul 28, 2021
  
  607c4e52
- updating version of proactive client to 1.5 and SAL to 3.6 · 69f67db9
  Tomek Piekarz authored Jul 28, 2021
  
  69f67db9
- updating version of proactive client to 1.5 and SAL to 3.6 · 82347c8a
  Tomek Piekarz authored Jul 28, 2021
  
  82347c8a
- updating version of proactive client to 1.5 · 1dff8b7e
  Tomek Piekarz authored Jul 28, 2021
  
  1dff8b7e
- Merge branch 'proactive-dev' into 'morph-rc1.5' · fe67f2d5
  Marta Różańska authored Jul 28, 2021
```
updating SAL and proactive client

See merge request !23
```
  fe67f2d5
26 Jul, 2021 1 commit
- -U in proactive client maven build · d072303a
  Marta Różańska authored Jul 26, 2021
  
  d072303a
13 Jul, 2021 9 commits
- changing mule plugin · 41c868ee
  Jan Marchel authored Jul 13, 2021
  
  41c868ee
- mule tools to original version · 6202fdf2
  Jan Marchel authored Jul 13, 2021
  
  6202fdf2
- adding compiler maven plugin · f7ffb6ec
  Jan Marchel authored Jul 13, 2021
  
  f7ffb6ec
- changing maven plugin version · 38683bdb
  Jan Marchel authored Jul 13, 2021
  
  38683bdb
- changing mule version · bc9dbea7
  Jan Marchel authored Jul 13, 2021
  
  bc9dbea7
- changing mule version · 2092b5f9
  Jan Marchel authored Jul 13, 2021
  
  2092b5f9
- changing mule version · bc3adee6
  Jan Marchel authored Jul 13, 2021
  
  bc3adee6
- changing mule version · ebbf35d7
  Jan Marchel authored Jul 13, 2021
  
  ebbf35d7
- changing mule version · 1726f3c9
  Jan Marchel authored Jul 13, 2021
  
  1726f3c9
07 Jul, 2021 4 commits
- updating version of proactive client to 1.4 and SAL to 3.5 · 4dd6325e
  Marta Różańska authored Jul 07, 2021
  
  4dd6325e
- Merge branch 'morph-rc15-sync' into 'morph-rc1.5' · 48757316
  Marta Różańska authored Jul 07, 2021
```
updating SAL and proactive client

See merge request !22
```
  48757316
- Merge branch 'proactive-dev' into morph-rc15-sync · 0ca9d2cc
  Marta Różańska authored Jul 07, 2021
```
# Conflicts:
#	connectors/proactive_client/pom.xml
#	mule_esb/mule-integration/pom.xml
```
  0ca9d2cc
- Merge remote-tracking branch 'origin/morph-rc1.5' into proactive-dev · de266da7
  Marta Różańska authored Jul 07, 2021
```
# Conflicts:
#	connectors/pom.xml
#	connectors/proactive_client/pom.xml
#	mule_esb/mule-integration/pom.xml
```
  de266da7
25 Jun, 2021 2 commits
- Revert "updating versions from 4.0 to 4.5 of Melodic components, proactive client to 1.5" · fba28e96
  Marta Różańska authored Jun 25, 2021
```
This reverts commit d92e187a
```
  fba28e96
- updating versions from 4.0 to 4.5 of Melodic components, proactive client to 1.5 · d92e187a
  Marta Różańska authored Jun 25, 2021
  
  d92e187a
24 Jun, 2021 5 commits
- f · fa517607
  Marta Różańska authored Jun 24, 2021
  
  fa517607
- Merge branch 'morph-rc15-sync' into 'morph-rc1.5' · 4f8f919c
  Marta Różańska authored Jun 24, 2021
```
Morph rc15 sync

See merge request !21
```
  4f8f919c
- Morph rc15 sync · 7c22e2b8
  Marta Różańska authored Jun 24, 2021
  
  7c22e2b8
- image tag in .yml · 01f4b52e
  Marta Różańska authored Jun 24, 2021
  
  01f4b52e
- 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 2 commits
- Merge branch 'morph-rc15-sync' into 'morph-rc1.5' · 9515a594
  Marta Różańska authored Jun 23, 2021
```
updating version of proactive-client to 1.1

See merge request !20
```
  9515a594
- updating version of proactive-client to 1.1 · c5928f7c
  Marta Różańska authored Jun 23, 2021
  
  c5928f7c