diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d38d9787c..5363c30143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ PROJECT(h2o) SET(VERSION_MAJOR "2") SET(VERSION_MINOR "2") SET(VERSION_PATCH "0") -SET(VERSION_PRERELEASE "-beta3") +SET(VERSION_PRERELEASE "") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_PRERELEASE}") SET(LIBRARY_VERSION_MAJOR "0") SET(LIBRARY_VERSION_MINOR "13") diff --git a/Changes b/Changes index db6705014f..16574c848b 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ Revision history for H2O. -2.2.0 TBD +2.2.0 2017-04-05 02:18:00+0000 - [core] add `crash-handler.wait-pipe-close` parameter #1092 (Frederik Deweerdt) - [core] introduce an option to bypass the `server` header sent from upstream #1226 (Frederik Deweerdt) - [core] apply global- and host-level configuration to requests not applicable to any of the path-level configurations #1231 (Kazuho Oku) diff --git a/include/h2o/version.h b/include/h2o/version.h index cf01401a98..73e3f89ec6 100644 --- a/include/h2o/version.h +++ b/include/h2o/version.h @@ -22,7 +22,7 @@ #ifndef h2o__version_h #define h2o__version_h -#define H2O_VERSION "2.2.0-beta3" +#define H2O_VERSION "2.2.0" #define H2O_VERSION_MAJOR 2 #define H2O_VERSION_MINOR 2