diff options
author | Joe Fernandez <joefernandez@google.com> | 2014-09-24 15:56:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 15:56:02 +0000 |
commit | 2c1ef5328cee7059b1ab0d8de849c2fa474f88dd (patch) | |
tree | e568b03ffd79af83302a27f726e4e500999edf4b | |
parent | bca67fd7d0747a950e88525d216af41272b20763 (diff) | |
parent | 1968b91937020e8aa826224642733bbb9055af2e (diff) | |
download | frameworks_base-2c1ef5328cee7059b1ab0d8de849c2fa474f88dd.zip frameworks_base-2c1ef5328cee7059b1ab0d8de849c2fa474f88dd.tar.gz frameworks_base-2c1ef5328cee7059b1ab0d8de849c2fa474f88dd.tar.bz2 |
am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '1968b91937020e8aa826224642733bbb9055af2e':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
-rw-r--r-- | docs/html/app.yaml | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/docs/html/app.yaml b/docs/html/app.yaml index 9ffb775..520ee99 100644 --- a/docs/html/app.yaml +++ b/docs/html/app.yaml @@ -1,38 +1,25 @@ application: androidappdocs-staging version: 1 -runtime: python +runtime: python27 +threadsafe: true api_version: 1 +# compatibility: gae-1.9.4+ -# This file defines two mutually exclusive -# hander blocks: -# - a handler for use on a local dev_appserver -# during development or non-production doc build -# - a handler for use on a production gae -# instance. This handler requires that the -# docs files in the app have been compressed -# with divide_and_compress.py and that main.py -# and gae_shell/ are present. -# -# Only one of the handler blocks should be -# uncommented at any given time. By default, -# the development handler is exposed. +# handler for local staging servers +# WARNING: NOT FOR USE IN PRODUCTION + +# Use this handler definition with +# Google App Engine 1.9.4 or higher. +# NOT compatible with prior GAE versions handlers: # DEVELOPMENT HANDLER -# (this handler block *must* be commented -# out before pushing to a production server) -- url: / - static_dir: / +- url: /(.+) + static_files: \1 + upload: (.+) -# PRODUCTION GAE HANDLER -#- url: /gae_shell/static -# static_dir: gae_shell/static -# expiration: 1d -# -#- url: /gae_shell/.* -# script: /gae_shell/shell.py -# login: admin -# -#- url: .* -# script: main.py +# Direct default, blank requests +- url: / + static_files: index.html + upload: index.html
\ No newline at end of file |