Merging develop to master in preparation for 2.7.0 release.

zendframework · May 14, 2018 · 97e7d70 · 97e7d70
2 parents 1d520aa + 04411ef
commit 97e7d70
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,17 +53,6 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-    - php: hhvm 
-      env:
-        - DEPS=lowest
-    - php: hhvm 
-      env:
-        - DEPS=locked
-    - php: hhvm 
-      env:
-        - DEPS=latest
-  allow_failures:
-    - php: hhvm
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.3 - TBD
+## 2.7.0 - 2018-05-14
 
 ### Added
 
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#32](https://github.com/zendframework/zend-xmlrpc/pull/32) removes support for HHVM.
 
 ### Fixed
 

diff --git a/composer.json b/composer.json
@@ -49,8 +49,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6.x-dev",
-            "dev-develop": "2.7.x-dev"
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         }
     },
     "scripts": {

diff --git a/composer.lock b/composer.lock