Skip to content

Commit

Permalink
Merge branch 'master' into dpebot-repositorygardener
Browse files Browse the repository at this point in the history
  • Loading branch information
lesv authored Mar 5, 2017
2 parents f972893 + a3f8710 commit d51d555
Show file tree
Hide file tree
Showing 16 changed files with 0 additions and 20 deletions.
1 change: 0 additions & 1 deletion flexible/analytics/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START env_variables]
env_variables:
Expand Down
1 change: 0 additions & 1 deletion flexible/async-rest/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always


env_variables:
Expand Down
1 change: 0 additions & 1 deletion flexible/cloudsql/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

automatic_scaling:
min_num_instances: 1
Expand Down
1 change: 0 additions & 1 deletion flexible/cloudstorage/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START env_variables]
env_variables:
Expand Down
1 change: 0 additions & 1 deletion flexible/cron/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always
1 change: 0 additions & 1 deletion flexible/datastore/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always
1 change: 0 additions & 1 deletion flexible/disk/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always
1 change: 0 additions & 1 deletion flexible/endpoints/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

beta_settings:
# Enable Google Cloud Endpoints API management.
Expand Down
1 change: 0 additions & 1 deletion flexible/extending-runtime/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ env: flexible
handlers:
- url: /.*
script: this field is required, but ignored
secure: always
1 change: 0 additions & 1 deletion flexible/helloworld/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always
# [END appyaml]
2 changes: 0 additions & 2 deletions flexible/mailgun/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START env_variables]
env_variables:
MAILGUN_DOMAIN_NAME: YOUR-MAILGUN-DOMAIN-NAME
MAILGUN_API_KEY: YOUR-MAILGUN-API-KEY
# [END env_variables]

1 change: 0 additions & 1 deletion flexible/mailjet/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START env_variables]
env_variables:
Expand Down
2 changes: 0 additions & 2 deletions flexible/memcache/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START config]
beta_settings:
use_memcache_proxy: true
# [END config]

2 changes: 0 additions & 2 deletions flexible/sendgrid/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START env_variables]
env_variables:
SENDGRID_API_KEY: YOUR-SENDGRID-API-KEY
SENDGRID_SENDER: YOUR-SENDGRID-SENDER
# [END env_variables]

1 change: 0 additions & 1 deletion flexible/static-files/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always
2 changes: 0 additions & 2 deletions flexible/twilio/src/main/appengine/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ env: flex
handlers:
- url: /.*
script: this field is required, but ignored
secure: always

# [START env_variables]
env_variables:
TWILIO_ACCOUNT_SID: YOUR-TWILIO-ACCOUNT-SID
TWILIO_AUTH_TOKEN: YOUR-TWILIO-AUTH-TOKEN
TWILIO_NUMBER: YOUR-TWILIO-NUMBER
# [END env_variables]

0 comments on commit d51d555

Please sign in to comment.