From a8afbc8ceea83c167ca6704b6423489bc79f543c Mon Sep 17 00:00:00 2001
From: antao <antao2002@gmail.com>
Date: Sat, 31 Aug 2019 18:39:46 +0800
Subject: [PATCH] Update drogon version to v1.0.0-beta7

---
 CMakeLists.txt |  5 ++---
 ChangeLog.md   | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60bd02b0..16a77fb2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(DROGON_MINOR_VERSION 0)
 set(DROGON_PATCH_VERSION 0)
 set(DROGON_VERSION
     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
-set(PRE_RELEASE_STRING "beta6")
+set(PRE_RELEASE_STRING "beta7")
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
@@ -57,8 +57,7 @@ target_include_directories(
 list(APPEND INCLUDE_DIRS_FOR_DYNAMIC_VIEW
             ${PROJECT_SOURCE_DIR}/lib/inc
             ${PROJECT_SOURCE_DIR}/orm_lib/inc
-            ${PROJECT_SOURCE_DIR}/trantor
-            ${INSTALL_INCLUDE_DIR})
+            ${PROJECT_SOURCE_DIR}/trantor)
 add_subdirectory(trantor)
 
 target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
diff --git a/ChangeLog.md b/ChangeLog.md
index fa26a0fa..8a095a85 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-beta7] - 2019-08-31
+
+### API change list
+
+- Remove the default value parameter of some methods (#220)
+
+### Changed
+
+- Optimize DNS in HttpClient and WebSocketClient (support c-ares library).
+
+- Reduce dependencies between declarations.
+
+- Add database tests in the travis CI and add test cases to database tests.
+
+- Reduce size of docker image.
+
+- Make the framework API support chained calls.
+  
+- Add a synchronous join point for AOP.
+
+- Modify the CMakeLists to modern cmake style.
+
+### Fixed
+
+- Fix bugs in default return values of functions(#220),
+
+- Fix a bug in the cmake configuration file when there's '+' in the building path.
+
+- Fix a bug in drogon_ctl (when creating orm models)
+
+
 ## [1.0.0-beta6] - 2019-08-08
 
 ### API change list
@@ -106,7 +137,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-beta6...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta7...HEAD
+
+[1.0.0-beta7]: https://github.com/an-tao/drogon/compare/v1.0.0-beta6...v1.0.0-beta7
 
 [1.0.0-beta6]: https://github.com/an-tao/drogon/compare/v1.0.0-beta5...v1.0.0-beta6