From 7731cdf326a0e6487a26fcca965ca0ac0360be98 Mon Sep 17 00:00:00 2001 From: JT Archie Date: Tue, 20 Oct 2015 11:33:07 -0400 Subject: [PATCH 1/7] bump machete v20 [#106114408] Signed-off-by: David Morhovich --- cf.Gemfile | 4 ++-- cf.Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cf.Gemfile b/cf.Gemfile index 5ca2e37fc..d5752e801 100644 --- a/cf.Gemfile +++ b/cf.Gemfile @@ -1,8 +1,8 @@ source "https://rubygems.org" -ruby '2.2.2' +ruby '2.2.3' -gem 'machete', git: 'https://github.com/cf-buildpacks/machete', tag: 'v0.0.19' +gem 'machete', git: 'https://github.com/cf-buildpacks/machete', tag: 'v0.0.20' gem 'buildpack-packager', git: 'https://github.com/cloudfoundry/buildpack-packager', tag: 'v2.2.5' gem 'rspec' gem 'rspec-instafail' diff --git a/cf.Gemfile.lock b/cf.Gemfile.lock index 943e7aa74..3144a8077 100644 --- a/cf.Gemfile.lock +++ b/cf.Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/cf-buildpacks/machete - revision: b898d1ddde706f4fdbc1c21c2066223500b163a2 - tag: v0.0.19 + revision: 0a1710de1f680a602f67f5eff60e9a424acca467 + tag: v0.0.20 specs: - machete (0.0.19) + machete (0.0.20) httparty GIT @@ -27,7 +27,7 @@ GEM tzinfo (~> 1.1) coderay (1.1.0) diff-lcs (1.2.5) - httparty (0.13.5) + httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) i18n (0.7.0) From 8ea3bea71a5c91e78bb9b730ddc507829e56b7a6 Mon Sep 17 00:00:00 2001 From: Amin Jams Date: Wed, 28 Oct 2015 11:31:26 -0400 Subject: [PATCH 2/7] Add support for nginx 1.9.6 Add support for nginx 1.9.6, drop support for nginx 1.9.5 [#106840684] (https://www.pivotaltracker.com/story/show/106840684) --- defaults/options.json | 2 +- manifest.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/options.json b/defaults/options.json index 9e90e3dd3..179991deb 100644 --- a/defaults/options.json +++ b/defaults/options.json @@ -14,7 +14,7 @@ "NGINX_VERSION": "{NGINX_18_LATEST}", "NGINX_16_LATEST": "1.6.3", "NGINX_18_LATEST": "1.8.0", - "NGINX_19_LATEST": "1.9.5", + "NGINX_19_LATEST": "1.9.6", "NGINX_PACKAGE": "nginx-{NGINX_VERSION}.tar.gz", "NGINX_DOWNLOAD_URL": "/nginx/{NGINX_VERSION}/{NGINX_PACKAGE}", "NGINX_STRIP": true, diff --git a/manifest.yml b/manifest.yml index 7d54d877f..3b43478e2 100644 --- a/manifest.yml +++ b/manifest.yml @@ -73,11 +73,11 @@ dependencies: - cflinuxfs2 md5: e12cddcba72d5008f94b298a02a8e6d4 - name: nginx - version: 1.9.5 - uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/nginx/nginx-1.9.5-linux-x64.tgz + version: 1.9.6 + uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/nginx/nginx-1.9.6-linux-x64.tgz cf_stacks: - cflinuxfs2 - md5: 549e7a96c800106093f598864e83802d + md5: 090c3a98aa1d2b630706d8164e0708ef - name: nginx version: 1.6.3 uri: https://pivotal-buildpacks.s3.amazonaws.com/nginx/cflinuxfs2/nginx-1.6.3-linux-x64.tgz From 3094e69aba0e63bfe7862a3940f3f79e51db96c7 Mon Sep 17 00:00:00 2001 From: David Morhovich Date: Fri, 30 Oct 2015 14:10:23 -0400 Subject: [PATCH 3/7] Adds pending test for `gettext`. Adds pending test that shows `gettext` does not work for PHP for non base locales. (See http://cf-dev.70369.x6.nabble.com/cf-dev-PHP-extension-gettext-doesn-t-work-td1984.html#a2178) [#106641954] Signed-off-by: David Jahn --- .../.bp-config/options.json | 3 + .../fixtures/php_app_testing_locale/LICENSE | 201 ++++++++++++++++++ .../fixtures/php_app_testing_locale/index.php | 16 ++ .../locale/ja_JP.utf8/LC_MESSAGES/messages.mo | Bin 0 -> 427 bytes .../locale/ja_JP.utf8/LC_MESSAGES/messages.po | 22 ++ .../deploy_app_testing_locale_spec.rb | 27 +++ 6 files changed, 269 insertions(+) create mode 100644 cf_spec/fixtures/php_app_testing_locale/.bp-config/options.json create mode 100644 cf_spec/fixtures/php_app_testing_locale/LICENSE create mode 100644 cf_spec/fixtures/php_app_testing_locale/index.php create mode 100644 cf_spec/fixtures/php_app_testing_locale/locale/ja_JP.utf8/LC_MESSAGES/messages.mo create mode 100644 cf_spec/fixtures/php_app_testing_locale/locale/ja_JP.utf8/LC_MESSAGES/messages.po create mode 100644 cf_spec/integration/deploy_app_testing_locale_spec.rb diff --git a/cf_spec/fixtures/php_app_testing_locale/.bp-config/options.json b/cf_spec/fixtures/php_app_testing_locale/.bp-config/options.json new file mode 100644 index 000000000..b806a9bed --- /dev/null +++ b/cf_spec/fixtures/php_app_testing_locale/.bp-config/options.json @@ -0,0 +1,3 @@ +{ + "PHP_EXTENSIONS": ["gettext", "mbstring"] +} diff --git a/cf_spec/fixtures/php_app_testing_locale/LICENSE b/cf_spec/fixtures/php_app_testing_locale/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/cf_spec/fixtures/php_app_testing_locale/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/cf_spec/fixtures/php_app_testing_locale/index.php b/cf_spec/fixtures/php_app_testing_locale/index.php new file mode 100644 index 000000000..85e96f8d2 --- /dev/null +++ b/cf_spec/fixtures/php_app_testing_locale/index.php @@ -0,0 +1,16 @@ +'; +?> diff --git a/cf_spec/fixtures/php_app_testing_locale/locale/ja_JP.utf8/LC_MESSAGES/messages.mo b/cf_spec/fixtures/php_app_testing_locale/locale/ja_JP.utf8/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..5c35b8c6d1ba16eb6e9b2ec4cfca95b5cb1e512a GIT binary patch literal 427 zcmYL_%}&BV6osqNO?Bnk#q8l?Awgk8L!|>W_RmsCG;uM~vDDNKnGXIuh+7}cXYp2z zoZK&S7w68LxnD, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-26 17:50+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: index.php:14 +msgid "hello-world" +msgstr "Hello, world" diff --git a/cf_spec/integration/deploy_app_testing_locale_spec.rb b/cf_spec/integration/deploy_app_testing_locale_spec.rb new file mode 100644 index 000000000..642d0f3ce --- /dev/null +++ b/cf_spec/integration/deploy_app_testing_locale_spec.rb @@ -0,0 +1,27 @@ +$: << 'cf_spec' +require 'cf_spec_helper' + +describe 'CF PHP Buildpack' do + let(:browser) { Machete::Browser.new(@app) } + before(:context) do + @app = Machete.deploy_app( + 'php_app_testing_locale' + ) + end + + after(:context) do + Machete::CF::DeleteApp.new.execute(@app) + end + + context 'the application should run and emit the translated string' do + + pending 'expects an app to be running' do + expect(@app).to be_running + + browser.visit_path('/') + expect(browser).to have_body 'Hello, world' + end + end +end + + From 4de205dfeddb081596729dc0b95dfd271e4e8e29 Mon Sep 17 00:00:00 2001 From: David Morhovich Date: Fri, 30 Oct 2015 16:27:10 -0400 Subject: [PATCH 4/7] Add PHP version 5.6.15 Signed-off-by: David Jahn --- defaults/options.json | 2 +- manifest.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defaults/options.json b/defaults/options.json index 179991deb..558f39ccc 100644 --- a/defaults/options.json +++ b/defaults/options.json @@ -23,7 +23,7 @@ "HHVM_DOWNLOAD_URL": "/hhvm/{HHVM_VERSION}/{HHVM_PACKAGE}", "HHVM_STRIP": true, "PHP_55_LATEST": "5.5.30", - "PHP_56_LATEST": "5.6.14", + "PHP_56_LATEST": "5.6.15", "PHP_VERSION": "{PHP_55_LATEST}", "PHP_PACKAGE": "php-{PHP_VERSION}.tar.gz", "PHP_DOWNLOAD_URL": "/php/{PHP_VERSION}/{PHP_PACKAGE}", diff --git a/manifest.yml b/manifest.yml index 3b43478e2..292c1d5a0 100644 --- a/manifest.yml +++ b/manifest.yml @@ -52,13 +52,6 @@ dependencies: cf_stacks: - cflinuxfs2 md5: d8ac34908b34e8a3c3d63354e81dbef8 - - name: php - version: 5.6.13 - uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/php/php-5.6.13-linux-x64-1442442154.tgz - modules: ["bz2", "curl", "dba", "exif", "fileinfo", "ftp", "gd", "gettext", "gmp", "imap", "ldap", "mbstring", "mcrypt", "mysql", "mysqli", "opcache", "openssl", "pcntl", "pdo", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "pgsql", "pspell", "readline", "snmp", "soap", "sockets", "xsl", "zip", "zlib", "lua", "suhosin", "msgpack", "xdebug", "imagick", "yaf", "redis", "memcache", "igbinary", "ioncube", "phpiredis", "xcache", "protobuf", "protocolbuffers", "mailparse", "mongo", "amqp", "phalcon", "twig", "sundown", "memcached", "intl"] - cf_stacks: - - cflinuxfs2 - md5: 4a7e990baa4b3b40dcc45fdda2858c3f - name: php version: 5.6.14 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/php/php-5.6.14-linux-x64-1444147435.tgz @@ -66,6 +59,13 @@ dependencies: cf_stacks: - cflinuxfs2 md5: 0c515aa2cd6b00394d732727ecfb2a1d + - name: php + version: 5.6.15 + uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/php/php-5.6.15-linux-x64-1446231796.tgz + modules: ["bz2", "curl", "dba", "exif", "fileinfo", "ftp", "gd", "gettext", "gmp", "imap", "ldap", "mbstring", "mcrypt", "mysql", "mysqli", "opcache", "openssl", "pcntl", "pdo", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "pgsql", "pspell", "readline", "snmp", "soap", "sockets", "xsl", "zip", "zlib", "intl", "igbinary", "imagick", "mailparse", "memcache", "mongo", "msgpack", "protocolbuffers", "redis", "sundown", "xdebug", "yaf", "amqp", "lua", "phpiredis", "protobuf", "phalcon", "suhosin", "twig", "xcache", "xhprof", "memcached", "ioncube"] + cf_stacks: + - cflinuxfs2 + md5: a73a683df058fa80cf2f7b5fe13314f3 - name: nginx version: 1.8.0 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/nginx/nginx-1.8.0-linux-x64.tgz From 5766c6e3a5a90fe880a5340b378890a73fcd0d7f Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 6 Nov 2015 14:46:10 -0500 Subject: [PATCH 5/7] Removing manually-set modules on PHP 5.6.15 so that we can have the pipeline machine-generate the list. --- manifest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index 292c1d5a0..923e75297 100644 --- a/manifest.yml +++ b/manifest.yml @@ -62,7 +62,6 @@ dependencies: - name: php version: 5.6.15 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/php/php-5.6.15-linux-x64-1446231796.tgz - modules: ["bz2", "curl", "dba", "exif", "fileinfo", "ftp", "gd", "gettext", "gmp", "imap", "ldap", "mbstring", "mcrypt", "mysql", "mysqli", "opcache", "openssl", "pcntl", "pdo", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "pgsql", "pspell", "readline", "snmp", "soap", "sockets", "xsl", "zip", "zlib", "intl", "igbinary", "imagick", "mailparse", "memcache", "mongo", "msgpack", "protocolbuffers", "redis", "sundown", "xdebug", "yaf", "amqp", "lua", "phpiredis", "protobuf", "phalcon", "suhosin", "twig", "xcache", "xhprof", "memcached", "ioncube"] cf_stacks: - cflinuxfs2 md5: a73a683df058fa80cf2f7b5fe13314f3 From ab355e8761a9bf61a7c8eb23e9c9ab3c7abdda0a Mon Sep 17 00:00:00 2001 From: CI Bot Date: Fri, 6 Nov 2015 19:47:01 +0000 Subject: [PATCH 6/7] Updated manifest with supported PHP modules --- manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.yml b/manifest.yml index 923e75297..292c1d5a0 100644 --- a/manifest.yml +++ b/manifest.yml @@ -62,6 +62,7 @@ dependencies: - name: php version: 5.6.15 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/php/php-5.6.15-linux-x64-1446231796.tgz + modules: ["bz2", "curl", "dba", "exif", "fileinfo", "ftp", "gd", "gettext", "gmp", "imap", "ldap", "mbstring", "mcrypt", "mysql", "mysqli", "opcache", "openssl", "pcntl", "pdo", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "pgsql", "pspell", "readline", "snmp", "soap", "sockets", "xsl", "zip", "zlib", "intl", "igbinary", "imagick", "mailparse", "memcache", "mongo", "msgpack", "protocolbuffers", "redis", "sundown", "xdebug", "yaf", "amqp", "lua", "phpiredis", "protobuf", "phalcon", "suhosin", "twig", "xcache", "xhprof", "memcached", "ioncube"] cf_stacks: - cflinuxfs2 md5: a73a683df058fa80cf2f7b5fe13314f3 From fed4a081c2a6e0302065ef18f9204352f4103742 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 6 Nov 2015 14:56:08 -0500 Subject: [PATCH 7/7] Version bump to v4.2.1. --- CHANGELOG | 10 ++++++++++ VERSION | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 96cee93b6..a4d053f9a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +v4.2.1 Nov 06, 2015 +==================== + +* Add support for nginx 1.9.6, drop support for nginx 1.9.5. + (https://www.pivotaltracker.com/story/show/106840684) + +* Add support for PHP 5.6.16, drop support for PHP 5.6.13. + (https://www.pivotaltracker.com/story/show/106944148) + + v4.2.0 Oct 20, 2015 ==================== diff --git a/VERSION b/VERSION index 6aba2b245..fae6e3d04 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.0 +4.2.1