Commits · master · Melodic / melodic-utils

Apr 08, 2021
- Merge branch 'fix_choosing_ip_during_installation' into 'master' · b779aa43
  Marta Różańska authored Apr 08, 2021
```
removed ip checking service which has been closed

See merge request !20
```
  melodic-v3.1-RELEASE
  
  b779aa43
- removed ip checking service which has been closed · f5c5db42
  marcinbyra authored Apr 08, 2021
  
  f5c5db42
Apr 06, 2021
- Merge branch 'rc3.1-to-master-candidate' into 'master' · 7e6a524f
  Alicja Reniewicz authored Apr 06, 2021
```
Rc3.1 to master candidate

See merge request !16
```
  7e6a524f
Mar 30, 2021
- image branch in envs for master · 97c4261d
  Alicja Reniewicz authored Mar 30, 2021
  
  97c4261d
- build docker image only for particular branches · 19973890
  Alicja Reniewicz authored Mar 30, 2021
  
  19973890
Mar 29, 2021
- Merge branch 'enable_mctssolver_in_docker_compose' into 'rc3.1' · d8986422
  Marta Różańska authored Mar 29, 2021
```
enabled mctssolver in docker compose

See merge request !15
```
  d8986422
- enabled mctssolver in docker compose · f0475de2
  marcinbyra authored Mar 29, 2021
  
  f0475de2
- Merge branch 'repairing_ipupdate' into 'rc3.1' · 1436383b
  Marta Różańska authored Mar 29, 2021
```
deleting http://tnx.nl/ip

See merge request !13
```
  1436383b
- deleting http://tnx.nl/ip · fb8198ab
  Jan Marchel authored Mar 29, 2021
```
deleting tnx.nl from .profile
```
  fb8198ab
Mar 26, 2021
- Merge branch 'fix_restarting_cloudiator' into 'rc3.1' · 63eeffe5
  Alicja Reniewicz authored Mar 26, 2021
```
fixed restarting couldiator countainers

See merge request !11
```
  63eeffe5
- fixed restarting couldiator countainers · ead388ae
  marcinbyra authored Mar 26, 2021
  
  ead388ae
Mar 24, 2021
- merge changes from master · 749b6dd7
  Alicja Reniewicz authored Mar 24, 2021
  
  749b6dd7
- Merge branch 'master' into rc3.1 · 716d5fd4
  Alicja Reniewicz authored Mar 24, 2021
  
  716d5fd4
- Merge branch 'changing-InfluxDb-version' into 'master' · d1070ed5
  Alicja Reniewicz authored Mar 24, 2021
```
changing InfluxDB version to 1.x

See merge request !8
```
  d1070ed5
- changing InfluxDB version to 1.x · 1c8ce3c8
  Jan Marchel authored Mar 24, 2021
  
  1c8ce3c8
Jul 08, 2020
- Merge branch 'ftt' into 'rc3.1' · 5dcda49c
  Alicja Reniewicz authored Jul 08, 2020
```
Add Functionizer Testing Tool

See merge request !6
```
  5dcda49c
- Add Functionizer Testing Tool · e1cb1732
  Maria C authored Jul 08, 2020 and Alicja Reniewicz committed Jul 08, 2020
  
  e1cb1732
May 12, 2020
- fix path in configureLdap.sh script · 992309c9
  Alicja Reniewicz authored May 12, 2020
  
  992309c9
- fix path in configureLdap.sh script · a1a01241
  Alicja Reniewicz authored May 12, 2020
  
  a1a01241
May 11, 2020
- fix path to ipupdate · 0adbd76d
  Alicja Reniewicz authored May 11, 2020
  
  0adbd76d
- Merge branch 'fix-path-in-ipupdate' into 'master' · e632efa7
  Anna Wyszomirska authored May 11, 2020
```
fix path by ipupdate command

See merge request !5
```
  e632efa7
- fix path by ipupdate command · 8402238b
  Alicja Reniewicz authored May 11, 2020
  
  8402238b
May 07, 2020
- Merge branch 'rc3.1-adding-new-solvers-types' into 'rc3.1' · 6db06622
  Alicja Reniewicz authored May 07, 2020
```
adding mctssolver to docker compose and properties

See merge request !4
```
  6db06622
- adding mctssolver to docker compose and properties · 1d68c592
  Marta Różańska authored May 07, 2020
  
  1d68c592
Apr 30, 2020
- set mariadb version for cloudiator · 604f8b12
  Alicja Reniewicz authored Apr 30, 2020
  
  604f8b12
- set mariadb version for cloudiator · 9c2f47f4
  Alicja Reniewicz authored Apr 30, 2020
  
  9c2f47f4
Apr 14, 2020
- changes for gitlab version · 733611a7
  Alicja Reniewicz authored Apr 14, 2020
  
  733611a7
- Merge branch 'rc3.0' into rc3.1 · 4041052b
  Alicja Reniewicz authored Apr 14, 2020
```
# Conflicts:
#	melodic_installation/installMelodic.sh
```
  4041052b
Apr 02, 2020
- Merge branch 'rc3.0' into 'master' · 2e13c0e4
  Alicja Reniewicz authored Apr 02, 2020
```
fix for get public ip

See merge request !2
```
  2e13c0e4
- fix for get public ip · a5388ded
  Alicja Reniewicz authored Apr 02, 2020
  
  a5388ded
- Merge pull request #169 in MEL/utils from master to rc3.1 · f4692697
  Anna Wyszomirska authored Apr 02, 2020
```
* commit '641e8bbc':
  fix problem with get_public_ip() in installation script
```
  f4692697
- Merge pull request #168 in MEL/utils from rc3.0 to master · 641e8bbc
  Alicja Reniewicz authored Apr 02, 2020
```
* commit 'a72b912f':
  fix problem with get_public_ip() in installation script
```
  641e8bbc
- fix problem with get_public_ip() in installation script · a72b912f
  Alicja Reniewicz authored Apr 02, 2020
  
  a72b912f
- Merge pull request #167 in MEL/utils from master to rc3.1 · c23484b1
  Anna Wyszomirska authored Apr 02, 2020
```
* commit 'a3e9f23f':
  fix problem with not only IP in response from icanhazip.com
  enable dlms agent installation
  credentials for ActiveMQ in communication between dlms and ems
```
  c23484b1
- Merge pull request #166 in MEL/utils from rc3.0 to master · a3e9f23f
  Alicja Reniewicz authored Apr 02, 2020
```
* commit '9e085f63':
  fix problem with not only IP in response from icanhazip.com
```
  a3e9f23f
- Merge remote-tracking branch 'origin/rc3.0' into rc3.0 · 9e085f63
  Alicja Reniewicz authored Apr 02, 2020
  
  9e085f63
- fix problem with not only IP in response from icanhazip.com · a8258052
  Alicja Reniewicz authored Apr 02, 2020
  
  a8258052
- Merge branch 'rc3.0' into 'master' · c0deacae
  Alicja Reniewicz authored Apr 02, 2020
```
Rc3.0

See merge request !1
```
  c0deacae
Apr 01, 2020
- change path to dlms agent from S3 ow2 · 0f621971
  Alicja Reniewicz authored Apr 01, 2020
  
  0f621971
Mar 25, 2020
- fix jwt-server image name · d8590c4a
  Alicja Reniewicz authored Mar 25, 2020
  
  d8590c4a