Skip to content

Commit b6b3197

Browse files
anguillanneufanguillanneuf
authored
Merge branch 'master' into pubsub
2 parents 86a0758 + 8f28cb6 commit b6b3197

File tree

190 files changed

+1501
-443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+1501
-443
lines changed

‎.kokoro/presubmit_tests_testing.cfg

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.kokoro/system_tests_testing.cfg

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎appengine/flexible/analytics/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def track_event(category, action, label=None, value=0):
4242
}
4343

4444
response = requests.post(
45-
'http://www.google-analytics.com/collect', data=data)
45+
'https://www.google-analytics.com/collect', data=data)
4646

4747
# If the request fails, this will raise a RequestException. Depending
4848
# on your application's needs, this may be a non-error and can be caught

‎appengine/flexible/analytics/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Flask==1.0.2
22
gunicorn==19.9.0
3-
requests[security]==2.19.1
3+
requests[security]==2.20.1

‎appengine/flexible/cloudsql_postgresql/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask==1.0.2
22
Flask-SQLAlchemy==2.3.2
33
gunicorn==19.9.0
4-
psycopg2==2.7.5
4+
psycopg2==2.7.6.1

‎appengine/flexible/datastore/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==0.12.2
2-
google-cloud-datastore==1.6.0
3-
gunicorn==19.7.1
1+
Flask==1.0.2
2+
google-cloud-datastore==1.7.1
3+
gunicorn==19.9.0

‎appengine/flexible/django_cloudsql/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Django==2.1
1+
Django==2.1.3
22
mysqlclient==1.3.13
3-
wheel==0.31.1
3+
wheel==0.32.3
44
gunicorn==19.9.0
5-
psycopg2==2.7.5
5+
psycopg2==2.7.6.1

‎appengine/flexible/hello_world_django/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django==2.1
1+
Django==2.1.3
22
gunicorn==19.9.0

‎appengine/flexible/mailgun/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Flask==1.0.2
22
gunicorn==19.9.0
3-
requests[security]==2.19.1
3+
requests[security]==2.20.1

‎appengine/flexible/mailjet/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask==1.0.2
22
gunicorn==19.9.0
3-
requests[security]==2.19.1
3+
requests[security]==2.20.1
44
mailjet-rest==1.3.0

0 commit comments

Comments
 (0)