Merge branch 'master' into grpc-js-xds_fault_injection

murgatroid99 · murgatroid99 · commit 12667aa6c3b9 · 2021-08-10T10:50:28.000-07:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+packages/grpc-js-xds/src/generated/** linguist-generated
+packages/grpc-js-xds/interop/generated/** linguist-generated

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+packages/grpc-js-xds/src/generated/** linguist-generated`
	`2`	`+packages/grpc-js-xds/interop/generated/** linguist-generated`