Merge branch 'master' into add-scripts-for-updating-discovery-artifacts-using-github-action

parthea · web-flow · commit dfb5856938ac · 2021-04-11T08:07:54.000-04:00
diff --git a/.github/header-checker-lint.yml b/.github/header-checker-lint.yml
@@ -1,6 +1,6 @@
 {"allowedCopyrightHolders": ["Google LLC"],
  "allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"],
- "ignoreFiles": ["**/requirements.txt", "**/requirements-test.txt"],
+ "ignoreFiles": ["**/requirements.txt", "**/requirements-test.txt", "**/__init__.py", "samples/**/constraints.txt", "samples/**/constraints-test.txt"],
  "sourceFileExtensions": [
  	"ts", 
  	"js", 
diff --git a/synth.metadata b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/google-api-python-client.git",
-        "sha": "9a75e3e99d3f718f08fe197e77a605efc1ad5bb6"
+        "sha": "bd2c5f9c5c5181e21cf970eb6f966afcf0323723"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "705743e66f5c0b24a95f7f30619c9d3ef747b317"
+        "sha": "0a071b3460344886297a304253bf924aa68ddb7e"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/google-api-python-client.git",`
`7`		`- "sha": "9a75e3e99d3f718f08fe197e77a605efc1ad5bb6"`
	`7`	`+ "sha": "bd2c5f9c5c5181e21cf970eb6f966afcf0323723"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"git": {`
`12`	`12`	`"name": "synthtool",`
`13`	`13`	`"remote": "https://github.com/googleapis/synthtool.git",`
`14`		`- "sha": "705743e66f5c0b24a95f7f30619c9d3ef747b317"`
	`14`	`+ "sha": "0a071b3460344886297a304253bf924aa68ddb7e"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`],`