diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-11 10:52:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-11 10:52:16 +0100 |
| commit | c85543f88df7268f63bcfd64220ba6c21797f27b (patch) | |
| tree | 6a3311a969d068d2d05fc3d4f2544aff2cacf4a5 /coin/provisioning/qtci-linux-openSUSE-15.0-x86_64 | |
| parent | 4e5a86d2bbe6cd30e46a364f96a861b37bbf7f96 (diff) | |
| parent | ae27f21d2697edf0b513b2c52bb1ecbbe658053b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtdeclarative.yaml
coin/platform_configs/qtsaferenderer.yaml
coin/platform_configs/qtsdk.yaml
coin/provisioning/common/linux/cmake_linux.sh
coin/provisioning/common/windows/cmake.ps1
Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-15.0-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh |