diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:25:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:37:07 +0200 |
commit | 29befcc995ebb3572ebe082c28e0e01f47b2baa2 (patch) | |
tree | a9b9bfe69aaa9278e548c34c027b997632768ea7 /coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 | |
parent | b90dc27784a9d78284518e12b80a0054ef560760 (diff) | |
parent | cfef857815392831dc15075c98c53041689a01a4 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" |