From 820df6feacb391a15f74c4e726c4f8f285544b79 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 25 Jan 2016 00:04:17 +0100 Subject: [PATCH 1/4] #64 - adding to release notes --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aea0c7d3..7d14d1f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#64](https://github.com/zendframework/zend-servicemanager/pull/64) performance optimizations + when dealing with alias resolution during service manager instantiation ### Deprecated From 2f334069f55ef01b7bb16be9c0b655b873be1275 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 25 Jan 2016 00:48:26 +0100 Subject: [PATCH 2/4] Adding 3.0.3 changelog block (for future releases) --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d14d1f6..91378a1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,24 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. +## 3.0.3 - TBD + +### Added + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + ## 3.0.2 - 2015-01-24 ### Added From 897d016636391b939735366d428b5b3a53029d81 Mon Sep 17 00:00:00 2001 From: Vytautas Stankus Date: Mon, 25 Jan 2016 10:26:40 +0200 Subject: [PATCH 3/4] Fixed release date someone is still living in 2015 :D --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91378a1e..ea4574b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,7 +57,7 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 3.0.2 - 2015-01-24 +## 3.0.2 - 2016-01-24 ### Added From 292f36f1af4be8cae75d5a57c366d6df0b53cd08 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 25 Jan 2016 15:17:08 +0100 Subject: [PATCH 4/4] #84 - merge conflict resolution --- CHANGELOG.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4574b9..3cceeb7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,24 +39,6 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. -## 3.0.3 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 3.0.2 - 2016-01-24 ### Added