Merge pull request #21327 from amygdala/gbphp

Auto commit by PR queue bot

Merge pull request #21327 from amygdala/gbphp
c6b6fb6e · k8s-merge-robot · 4c69bdaa · 2d8f857a · c6b6fb6e · c6b6fb6e
Commit c6b6fb6e authored Feb 17, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

frontend-controller.yaml examples/guestbook/frontend-controller.yaml +1 -1

guestbook.php examples/guestbook/php-redis/guestbook.php +1 -3

No files found.
--- a/examples/guestbook/frontend-controller.yaml
+++ b/examples/guestbook/frontend-controller.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
      - name: php-redis
-        image: gcr.io/google_samples/gb-frontend:v3
+        image: gcr.io/google_samples/gb-frontend:v4
        resources:
          requests:
            cpu: 100m

--- a/examples/guestbook/php-redis/guestbook.php
+++ b/examples/guestbook/php-redis/guestbook.php
-<?
-
-set_include_path('.:/usr/local/lib/php');
+<?php

 error_reporting(E_ALL);
 ini_set('display_errors', 1);