From cd4e0bda578cb61945922f8a8ee81fa77bb65de6 Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Fri, 4 Aug 2017 21:58:21 +0900
Subject: [PATCH] Updated the version to 2.1.5.

Version 2.1.4 will be removed.
See https://github.com/msgpack/msgpack-c/issues/623
---
 CHANGELOG.md                     | 6 +++++-
 README.md                        | 2 +-
 appveyor.yml                     | 2 +-
 include/msgpack/version_master.h | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15a2c7a6..3e43f117 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-# 2017-08-03 version 2.1.4
+# 2017-08-04 version 2.1.5
+  * Improve cross platform configuration (#624)
   * Add boost asio examples (including zlib) (#610)
   * Remove some warnings (#611)
   * Fix unpack visitor to treat float32/64 correctly (#613)
@@ -6,6 +7,9 @@
   * Fix alignment problem on some platform (#617, #518)
   * Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem (#619)
 
+# 2017-08-03 version 2.1.4 (Invalid)
+  * See https://github.com/msgpack/msgpack-c/issues/623
+
 # 2017-06-15 version 2.1.3
   * Improve build system (#603)
   * Add C++17 adaptors `std::optional` and `std::string_view`. (#607, #608)
diff --git a/README.md b/README.md
index 36f217c9..1c84dd0f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================
 
-Version 2.1.4 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 2.1.5 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
 
 It's like JSON but small and fast.
 
diff --git a/appveyor.yml b/appveyor.yml
index 2023ec10..8a196c36 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.4.{build}
+version: 2.1.5.{build}
 
 image:
 - Visual Studio 2015
diff --git a/include/msgpack/version_master.h b/include/msgpack/version_master.h
index 1b8f6049..45569412 100644
--- a/include/msgpack/version_master.h
+++ b/include/msgpack/version_master.h
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    2
 #define MSGPACK_VERSION_MINOR    1
-#define MSGPACK_VERSION_REVISION 4
+#define MSGPACK_VERSION_REVISION 5