Merge remote-tracking branch 'origin/master' into 6.0.x

samples/server/petstore/python-flask/git_push.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
@@ -55,4 +55,3 @@ git pull origin master
 # Pushes (Forces) the changes in the local repository up to the remote repository
 echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
 git push origin master 2>&1 | grep -v 'To https'
-

samples/server/petstore/python-flask/openapi_server/controllers/security_controller_.py

@@ -45,4 +45,3 @@ def validate_scope_petstore_auth(required_scopes, token_scopes):
     """
     return set(required_scopes).issubset(set(token_scopes))
 
-

samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml

@@ -492,7 +492,7 @@ paths:
                 format: int32
                 type: integer
             X-Expires-After:
-              description: date in UTC when toekn expires
+              description: date in UTC when token expires
               schema:
                 format: date-time
                 type: string