From b0e1d31d4f9582c1d2f78456600eecd919569dfa Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 6 Feb 2018 11:11:39 -0600 Subject: [PATCH 1/2] Updates branch aliases - dev-master => 2.0.x-dev - dev-develop => 2.1.x-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index df28085..2fac264 100644 --- a/composer.json +++ b/composer.json @@ -47,8 +47,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1.x-dev", - "dev-develop": "2.0.x-dev" + "dev-master": "2.0.x-dev", + "dev-develop": "2.1.x-dev" }, "class": "Zend\\ComponentInstaller\\ComponentInstaller" }, diff --git a/composer.lock b/composer.lock index 1400339..e7e1538 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": "52b4abe3477dc9681d07ba8566953fcb", + "content-hash": "de6d1d0b71061154c297bd58a5fa3e6b", "packages": [], "packages-dev": [ { From 8c19c9302ff8a11c11a237d8c0300bc24d350908 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 6 Feb 2018 11:12:23 -0600 Subject: [PATCH 2/2] Prepares CHANGELOG for 2.0.0 - Adds release date for 2.0.0 - Removes empty 1.1.2 stub --- CHANGELOG.md | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23c3ef7..39581c0 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.0.0 - TBD +## 2.0.0 - 2018-02-06 ### Added @@ -29,28 +29,6 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 1.1.2 - TBD - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 1.1.1 - 2018-01-11 ### Added