diff options
| author | Jisi Liu <liujisi@google.com> | 2017-08-07 11:47:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 11:47:29 -0700 |
| commit | 3afcded28a6aa9c44adf801ca5bff2133fcf3030 (patch) | |
| tree | cebd73fdf090a98c32ad1a1c996af9cc8f1f8ad6 /jenkins/docker32 | |
| parent | 176713d6fbbf72056b009f76e7625f267273bd75 (diff) | |
| parent | 8f4b8e430a0cf087af423be434cf8d837027c651 (diff) | |
| download | protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.gz protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.bz2 protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.zip | |
Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1
Merge master into 3.4.x
Diffstat (limited to 'jenkins/docker32')
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 2c9d4165..1278889f 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -98,7 +98,7 @@ RUN composer config -g -- secure-http false RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ - git reset --hard 8d97b3d8b5a33650e822460b3b561802c969e86e && \ + git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \ ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \ ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \ ln -sfn /usr/local/php-5.5/bin/phpize /usr/bin/phpize && \ |