Merge remote-tracking branch 'origin/master' into feature/websockets-plugin

# Conflicts:
#	plugins/http/plugin.go
#	plugins/static/etag.go

6 files changed, 18 insertions, 18 deletions

diff --git a/tests/plugins/server/configs/.rr-no-app-section.yaml b/tests/plugins/server/configs/.rr-no-app-section.yaml
index e44eeb56..d28265d5 100644
--- a/tests/plugins/server/configs/.rr-no-app-section.yaml
+++ b/tests/plugins/server/configs/.rr-no-app-section.yaml
@@ -3,10 +3,10 @@ server:
   user: ""
   group: ""
   env:
-    "RR_CONFIG": "/some/place/on/the/C134"
-    "RR_CONFIG2": "C138"
+    - RR_CONFIG: "/some/place/on/the/C134"
+    - RR_CONFIG2: "C138"
   relay: "pipes"
   relay_timeout: "20s"
 logs:
   mode: development
-  level: error
\ No newline at end of file
+  level: error
diff --git a/tests/plugins/server/configs/.rr-sockets.yaml b/tests/plugins/server/configs/.rr-sockets.yaml
index 0bc2d0f9..4c57f36f 100644
--- a/tests/plugins/server/configs/.rr-sockets.yaml
+++ b/tests/plugins/server/configs/.rr-sockets.yaml
@@ -3,10 +3,10 @@ server:
   user: ""
   group: ""
   env:
-    "RR_CONFIG": "/some/place/on/the/C134"
-    "RR_CONFIG2": "C138"
+    - RR_CONFIG: "/some/place/on/the/C134"
+    - RR_CONFIG2: "C138"
   relay: "unix://unix.sock"
   relay_timeout: "20s"
 logs:
   mode: development
-  level: error
\ No newline at end of file
+  level: error
diff --git a/tests/plugins/server/configs/.rr-tcp.yaml b/tests/plugins/server/configs/.rr-tcp.yaml
index f4580460..4582482f 100644
--- a/tests/plugins/server/configs/.rr-tcp.yaml
+++ b/tests/plugins/server/configs/.rr-tcp.yaml
@@ -3,10 +3,10 @@ server:
   user: ""
   group: ""
   env:
-    "RR_CONFIG": "/some/place/on/the/C134"
-    "RR_CONFIG2": "C138"
+    - RR_CONFIG: "/some/place/on/the/C134"
+    - RR_CONFIG2: "C138"
   relay: "tcp://localhost:9999"
   relay_timeout: "20s"
 logs:
   mode: development
-  level: error
\ No newline at end of file
+  level: error
diff --git a/tests/plugins/server/configs/.rr-wrong-command.yaml b/tests/plugins/server/configs/.rr-wrong-command.yaml
index c97d8b7e..9d105d90 100644
--- a/tests/plugins/server/configs/.rr-wrong-command.yaml
+++ b/tests/plugins/server/configs/.rr-wrong-command.yaml
@@ -3,10 +3,10 @@ server:
   user: ""
   group: ""
   env:
-    "RR_CONFIG": "/some/place/on/the/C134"
-    "RR_CONFIG2": "C138"
+    - RR_CONFIG: "/some/place/on/the/C134"
+    - RR_CONFIG2: "C138"
   relay: "pipes"
   relay_timeout: "20s"
 logs:
   mode: development
-  level: error
\ No newline at end of file
+  level: error
diff --git a/tests/plugins/server/configs/.rr-wrong-relay.yaml b/tests/plugins/server/configs/.rr-wrong-relay.yaml
index 9722a487..c4d1edb0 100644
--- a/tests/plugins/server/configs/.rr-wrong-relay.yaml
+++ b/tests/plugins/server/configs/.rr-wrong-relay.yaml
@@ -3,10 +3,10 @@ server:
   user: ""
   group: ""
   env:
-    "RR_CONFIG": "/some/place/on/the/C134"
-    "RR_CONFIG2": "C138"
+    - RR_CONFIG: "/some/place/on/the/C134"
+    - RR_CONFIG2: "C138"
   relay: "pupes"
   relay_timeout: "20s"
 logs:
   mode: development
-  level: error
\ No newline at end of file
+  level: error
diff --git a/tests/plugins/server/configs/.rr.yaml b/tests/plugins/server/configs/.rr.yaml
index e44eeb56..d28265d5 100644
--- a/tests/plugins/server/configs/.rr.yaml
+++ b/tests/plugins/server/configs/.rr.yaml
@@ -3,10 +3,10 @@ server:
   user: ""
   group: ""
   env:
-    "RR_CONFIG": "/some/place/on/the/C134"
-    "RR_CONFIG2": "C138"
+    - RR_CONFIG: "/some/place/on/the/C134"
+    - RR_CONFIG2: "C138"
   relay: "pipes"
   relay_timeout: "20s"
 logs:
   mode: development
-  level: error
\ No newline at end of file
+  level: error