Merge current v2.6 into master

2022-03-22 15:55:22 +01:00
parent 2da7fa0397 23a6602cbf
commit 3bf4a8fbe2
25 changed files with 102 additions and 36 deletions
--- a/integration/simple_test.go
+++ b/integration/simple_test.go
@@ -32,7 +32,7 @@ func (s *SimpleSuite) TestInvalidConfigShouldFail(c *check.C) {
 	defer s.killCmd(cmd)

 	err = try.Do(500*time.Millisecond, func() error {
-		expected := "Near line 0 (last key parsed ''): bare keys cannot contain '{'"
+		expected := "expected '.' or '=', but got '{' instead"
 		actual := output.String()

 		if !strings.Contains(actual, expected) {