From 2e128fc3152c03c91723e216eff0a836a202799d Mon Sep 17 00:00:00 2001
From: antao <antao2002@gmail.com>
Date: Wed, 10 Jul 2019 09:50:09 +0800
Subject: [PATCH] Bump version to v1.0.0-beta2

---
 ChangeLog.md   | 25 ++++++++++++++++++++++++-
 get_version.sh |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 185b0d39..ad22857a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,8 +3,31 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-beta2] - 2019-07-10
+
+### Added
+
+- Add setBody methods to the HttpRequest class.
+- Add stress testing command to drogon_ctl.
+- Add -v, -h parameters to drogon_ctl.
+- Add the setContentTypeCodeAndCustomString method to the HttpResponse class.
+
+### Changed
+
+- Update the submodule - trantor.
+- Modify the handling of CORS.
+- Optimize the htmlTranslate method and the Field class.
+- Make all listeners share IO threads in the MacOS/Unix system.
+
+### Fixed
+
+- Fix a bug of the IsPlugin class.
+- Use default constructor of string_view to reset _statusMessage to fix a warning on GCC 9.1 on Arch Linux.
+
 ## [1.0.0-beta1] - 2019-06-11
 
-[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta1...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta2...HEAD
+
+[1.0.0-beta2]: https://github.com/an-tao/drogon/compare/v1.0.0-beta1...v1.0.0-beta2
 
 [1.0.0-beta1]: https://github.com/an-tao/drogon/releases/tag/v1.0.0-beta1
diff --git a/get_version.sh b/get_version.sh
index 6d2edcf5..70b01846 100755
--- a/get_version.sh
+++ b/get_version.sh
@@ -3,7 +3,7 @@
 GIT_VER=$(git log|grep ^commit|wc -l|sed -e "s/^ *//")
 MD5=$(git log|head -1|awk '{printf $2}')
 TMP_FILE=/tmp/version
-echo "#define VERSION \"1.0.0.beta1.$GIT_VER\"" > ${TMP_FILE}
+echo "#define VERSION \"1.0.0.beta2.$GIT_VER\"" > ${TMP_FILE}
 echo "#define VERSION_MD5 \"$MD5\"" >> ${TMP_FILE}
 if [ ! -f $1 ];then
 mv -f ${TMP_FILE} $1