From d59021ef9fbeff86f48eee06136fa834cb436f01 Mon Sep 17 00:00:00 2001
From: an-tao <antao2002@gmail.com>
Date: Wed, 19 Aug 2020 23:18:59 +0800
Subject: [PATCH] Bump version to 1.0.0-beta21

---
 CMakeLists.txt |  2 +-
 ChangeLog.md   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41d1f3cd..0df11f1d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(DROGON_MINOR_VERSION 0)
 set(DROGON_PATCH_VERSION 0)
 set(DROGON_VERSION
     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
-set(DROGON_VERSION_STRING "${DROGON_VERSION}.beta20")
+set(DROGON_VERSION_STRING "${DROGON_VERSION}.beta21")
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
diff --git a/ChangeLog.md b/ChangeLog.md
index 3e8c6910..e8cebe2b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-beta21] - 2020-08-19
+
+### Changed
+
+- Modify the Result class in orm.
+
+### Fixed
+
+- Fix zlib link error on Windows for the latest vcpkg.
+
 ## [1.0.0-beta20] - 2020-08-15
 
 ### API change list
@@ -492,7 +502,9 @@ All notable changes to this project will be documented in this file.
 
 ## [1.0.0-beta1] - 2019-06-11
 
-[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta20...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta21...HEAD
+
+[1.0.0-beta21]: https://github.com/an-tao/drogon/compare/v1.0.0-beta20...v1.0.0-beta21
 
 [1.0.0-beta20]: https://github.com/an-tao/drogon/compare/v1.0.0-beta19...v1.0.0-beta20