Merge branch 'master' into master

danasmera · danasmera · commit a41a72d1ff29 · 2016-03-01T20:03:21.000-05:00
diff --git a/container_engine/django_tutorial/mysite/settings.py b/container_engine/django_tutorial/mysite/settings.py
@@ -78,10 +78,10 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'polls',
-        'USER': 'django_user',
-        'PASSWORD': 'django',
-        'HOST': '173.194.104.255',
+        'NAME': '<your-database-name>',
+        'USER': '<your-database-user>',
+        'PASSWORD': '<your-database-password>',
+        'HOST': '<your-cloudsql-host>',
         'PORT': '3306',
     }
 }
diff --git a/monitoring/api/labeled_custom_metric.py b/monitoring/api/labeled_custom_metric.py
@@ -177,8 +177,7 @@ def main(project_id, color, size, count):
     write_custom_metric(client, project_id, now_rfc3339,
                         color, size, count)
     print ("Reading data from custom metric timeseries...")
-    write_custom_metric(client, project_id, now_rfc3339, color,
-                        size, count)
+    read_custom_metric(client, project_id, now_rfc3339, color, size)
 
 
 if __name__ == '__main__':
