Merge branch 'releases/2.5.1' into develop

2.5.1 readiness
zendframework · Jun 4, 2015 · 07d4bc9 · 07d4bc9
2 parents cf0a3a0 + 7d818ba
commit 07d4bc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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).