From 7677fce9e41668c6dc21928a19f7d977a186b4c4 Mon Sep 17 00:00:00 2001 From: Kazuho Oku Date: Sun, 23 Apr 2017 12:26:35 +0900 Subject: [PATCH] releng for 2.2.2 --- CMakeLists.txt | 4 ++-- Changes | 3 +++ include/h2o/version.h | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afb9ff9022..d39cdc76c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,12 +26,12 @@ PROJECT(h2o) SET(VERSION_MAJOR "2") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") SET(VERSION_PRERELEASE "") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_PRERELEASE}") SET(LIBRARY_VERSION_MAJOR "0") SET(LIBRARY_VERSION_MINOR "13") -SET(LIBRARY_VERSION_PATCH "1") +SET(LIBRARY_VERSION_PATCH "2") SET(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}${VERSION_PRERELEASE}") SET(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}") diff --git a/Changes b/Changes index 2de2a4b7b1..24ca780720 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for H2O. +2.2.2 2017-04-23 03:24:00+0000 + - [ssl] fix OCSP stapling error when LibreSSL is used #1275 (Ian Moone) + 2.2.1 2017-04-22 22:43:00+0000 - [mruby] correct the line number reported on an exception #1239 #1251 (Ichito Nagata) - [mruby] retain the order of request headers sharing a single name #1271 (Kazuho Oku) diff --git a/include/h2o/version.h b/include/h2o/version.h index aed7db86c2..1258ce14ea 100644 --- a/include/h2o/version.h +++ b/include/h2o/version.h @@ -22,14 +22,14 @@ #ifndef h2o__version_h #define h2o__version_h -#define H2O_VERSION "2.2.1" +#define H2O_VERSION "2.2.2" #define H2O_VERSION_MAJOR 2 #define H2O_VERSION_MINOR 2 -#define H2O_VERSION_PATCH 1 +#define H2O_VERSION_PATCH 2 #define H2O_LIBRARY_VERSION_MAJOR 0 #define H2O_LIBRARY_VERSION_MINOR 13 -#define H2O_LIBRARY_VERSION_PATCH 1 +#define H2O_LIBRARY_VERSION_PATCH 2 #endif