From 2a942210937c541710f8a6af7a2b2681a70754db Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 11 Apr 2018 11:19:11 -0500 Subject: [PATCH 1/3] Bumps branch aliases - dev-master => 2.8.x-dev - dev-develop => 2.9.x-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a8d85648..46c9b985 100644 --- a/composer.json +++ b/composer.json @@ -51,8 +51,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" }, "zf": { "component": "Zend\\Filter", diff --git a/composer.lock b/composer.lock index bb7b1b8e..e43c16da 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c9c1e3f9d0437c730092afb83918de23", + "content-hash": "3612e31463cab70dba11344f572f7123", "packages": [ { "name": "zendframework/zend-stdlib", From c23a84fadd5674e1045be8ab13996877679f3ab7 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 11 Apr 2018 11:19:31 -0500 Subject: [PATCH 2/3] Removes empty 2.7.3 stub --- CHANGELOG.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f60839e2..3bbb7018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,24 +37,6 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 2.7.3 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 2.7.2 - 2017-05-17 ### Added From e5f874763c1d78378b6dff99db5bfdd982e78b4f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 11 Apr 2018 11:19:45 -0500 Subject: [PATCH 3/3] Sets date for 2.8.0 in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bbb7018..1d8f4ba9 100644 --- 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.8.0 - TBD +## 2.8.0 - 2018-04-11 ### Added