Merge branch 'master' into patch-1

Azure · Nov 12, 2020 · 4975a14 · 4975a14
2 parents dd30c1e + b1bf206
commit 4975a14
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -50,4 +50,8 @@ manager
 
 # terraform artifacts
 .terraform*
-terraform.tfstate*
+terraform.tfstate*
+
+# operator bundle artifacts
+bundle.Dockerfile
+bundle/