diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-20 19:37:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-20 19:37:06 +0100 |
| commit | 0c839f87fb7d35ca13035d5b1b8d241310aab2c7 (patch) | |
| tree | ca62713f08f006078ee4999aac9e7526611c8b73 /coin/provisioning/common/unix | |
| parent | 2a4eafbc77d7cf60c4cef17b165e05d1c1d5267b (diff) | |
| parent | a9a4b97c7041e03d9833c0acfabd37576ae92306 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
coin/provisioning/common/unix/mqtt_broker.sh
Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2
Diffstat (limited to 'coin/provisioning/common/unix')
| -rw-r--r-- | coin/provisioning/common/unix/mqtt_broker.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index c6a65305..37732b31 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -40,7 +40,7 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e" -PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" SHA1="a0ac88715c2aebb9573a113dc13925a90da19233" targetFolder="/opt/paho_broker" |