Merge branch 'master' into spell_fixes

2017-12-27 09:49:06 +05:30
parent bc1accdc25 d946e32cb7
commit bf283d4d41
4083 changed files with 128909 additions and 543989 deletions
@@ -28,7 +28,7 @@ version: "2"
 services:

  redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
    ports:
      - "6379"