Merge remote-tracking branch 'origin/master' into develop

CSVD · Jul 15, 2019 · 0ffdd5e · 0ffdd5e
2 parents 5c885dc + 3465306
commit 0ffdd5e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/.env.template b/.env.template
@@ -18,4 +18,4 @@ SPLUNK_DEFAULT_INDEX=main
 SPLUNK_METRICS_INDEX=metrics
 SPLUNK_APPS_URL=https://splunkbase.splunk.com/app/2757/release/6.1.1/download,https://splunkbase.splunk.com/app/3245/release/1.0/download,https://splunkbase.splunk.com/app/1620/release/3.4.0/download,https://splunkbase.splunk.com/app/1467/release/2.5.8/download
 SPLUNKBASE_USERNAME=username
-SPLUNKBASE_PASSWORD=password
+SPLUNKBASE_PASSWORD=password
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/test-with-compose.sh b/test-with-compose.sh
@@ -27,5 +27,3 @@ docker container create --name dummy \
 docker cp dummy:/work/test-results/functional test-results
 docker rm dummy
 EXIT=$0
-
-
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -11,4 +11,4 @@ jinja2
 jinja2-time
 http://dev.splunk.com/goto/sdk-python
 flake8
-flaky
+flaky