diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-21 09:26:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-21 09:26:11 +0200 |
| commit | 5360fc7fcf15abd1ce73bb5be6b4516fbf66b2c0 (patch) | |
| tree | c924bfffb421a3e3c7b262811d1b71e045b9781b /coin/provisioning/common | |
| parent | f8086955b3f6f80cb7a1cb2a1fb1a7907a928183 (diff) | |
| parent | 92088b295cb5decbcedf0b2d1446d3f27d5f1e83 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.12
Change-Id: I593555fd39b6499d241acb00cc656bcdbef83d77
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/unix/mqtt_broker.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/mqtt_broker.ps1 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index 2d79c77b..22a9a66a 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -39,10 +39,10 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65" +CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e" PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd" +SHA1="a0ac88715c2aebb9573a113dc13925a90da19233" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index f362f55c..e37994c9 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -35,8 +35,8 @@ Write-Host "MQTT: Downloading Paho test broker..." $zip = Get-DownloadLocation "pahotest.zip" -$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65" -$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd" +$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e" +$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233" $internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" |