From 7d818ba6e5e5d085d58a29449013d8f2d19d0035 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 4 Jun 2015 10:35:07 -0500 Subject: [PATCH] [2.5.1] Release preparation - Set version and date in README, along with upgrade note. - Updated CHANGELOG. --- CHANGELOG.md | 4 ++++ README.md | 16 +++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c586a476e3a..11e242e6069 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 2.5.0 (2015-06-04) + +- [#7571](https://github.com/zendframework/zf2/pull/7571) makes `zend-ldap` an optional dependency instead of a hard dependency, as `zend-ldap` has a hard requirement on `ext-ldap`, blocking installation for many users. If you use `zend-ldap`, you will need to call `composer require zendframework/zend-ldap` after upgrading to 2.5.1. + ## 2.5.0 (2015-06-03) - [7072: Split Framework](https://github.com/zendframework/zf2/issues/7072) diff --git a/README.md b/README.md index 2415f8b4e81..4183ba2aa27 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,19 @@ ## RELEASE INFORMATION -*Zend Framework 2.5.0* +*Zend Framework 2.5.1* -This is the fifth minor (feature) release for the version 2 series. +This is the first maintenance release for the version 2.5 series. -03 June 2015 +04 June 2015 -### UPDATES IN 2.5.0 +### UPDATES IN 2.5.1 -This release modifies Zend Framework to be a metapackage, with dependencies on -each of the individual components that comprised Zend Framework in previous -versions. +- [#7571](https://github.com/zendframework/zf2/pull/7571) makes `zend-ldap` an + optional dependency instead of a hard dependency, as `zend-ldap` has a hard + requirement on `ext-ldap`, blocking installation for many users. If you use + `zend-ldap`, you will need to call `composer require zendframework/zend-ldap` + after upgrading to 2.5.1. Please see [CHANGELOG.md](CHANGELOG.md).