Merge branch 'master' into update-iam

eksctl-io · Jan 22, 2021 · f303006 · f303006
2 parents 65d4c07 + da2c317
commit f303006
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/release_notes/0.36.2.md b/docs/release_notes/0.36.2.md
@@ -0,0 +1,7 @@
+# Release 0.36.2
+
+## Improvements
+- Make v0.2.4 the default for VPC Resource Controller
+
+## Acknowledgments
+Weaveworks would like to sincerely thank our contributors!
diff --git a/integration/tests/crud/creategetdelete_test.go b/integration/tests/crud/creategetdelete_test.go
@@ -324,7 +324,7 @@ var _ = Describe("(Integration) Create, Get, Scale & Delete", func() {
 				})
 			})
 
-			Context("create, update and delete iamserviceaccounts", func() {
+			Context("create, update, and delete iamserviceaccounts", func() {
 				var (
 					cfg  *api.ClusterConfig
 					ctl  *eks.ClusterProvider