Merge pull request #1097 from wagnert/master

Fixed issue with blocking timer threads
appserver-io · Jun 18, 2018 · 8961206 · 8961206
2 parents e1f76fd + cafd5e7
commit 8961206
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+Version 1.1.6
+
+## Bugfixes
+
+* Fixed issue with blocking timer threads
+
+## Features
+
+* None
+
 Version 1.1.5
 
 ## Bugfixes

diff --git a/UPGRADE-1.1.6.md b/UPGRADE-1.1.6.md
@@ -0,0 +1,3 @@
+# Upgrade from 1.1.5 to 1.1.6
+
+Updating from 1.1.5 to 1.1.6 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.5.
diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.5
+release.version = 1.1.6
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

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