Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a41a72d

Browse filesBrowse files
committed
Merge branch 'master' into master
2 parents bda970c + 6da2b63 commit a41a72d
Copy full SHA for a41a72d

File tree

Expand file treeCollapse file tree

2 files changed

+5
-6
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-6
lines changed

‎container_engine/django_tutorial/mysite/settings.py

Copy file name to clipboardExpand all lines: container_engine/django_tutorial/mysite/settings.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
DATABASES = {
7979
'default': {
8080
'ENGINE': 'django.db.backends.mysql',
81-
'NAME': 'polls',
82-
'USER': 'django_user',
83-
'PASSWORD': 'django',
84-
'HOST': '173.194.104.255',
81+
'NAME': '<your-database-name>',
82+
'USER': '<your-database-user>',
83+
'PASSWORD': '<your-database-password>',
84+
'HOST': '<your-cloudsql-host>',
8585
'PORT': '3306',
8686
}
8787
}

‎monitoring/api/labeled_custom_metric.py

Copy file name to clipboardExpand all lines: monitoring/api/labeled_custom_metric.py
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ def main(project_id, color, size, count):
177177
write_custom_metric(client, project_id, now_rfc3339,
178178
color, size, count)
179179
print ("Reading data from custom metric timeseries...")
180-
write_custom_metric(client, project_id, now_rfc3339, color,
181-
size, count)
180+
read_custom_metric(client, project_id, now_rfc3339, color, size)
182181

183182

184183
if __name__ == '__main__':

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.