Skip to content

Commit 7a98138

Browse files
authored
Merge pull request #625 from redboltz/update_to_215
Updated the version to 2.1.5.
2 parents 1ad2db0 + cd4e0bd commit 7a98138

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
# 2017-08-03 version 2.1.4
1+
# 2017-08-04 version 2.1.5
2+
* Improve cross platform configuration (#624)
23
* Add boost asio examples (including zlib) (#610)
34
* Remove some warnings (#611)
45
* Fix unpack visitor to treat float32/64 correctly (#613)
56
* Improve documents (#616)
67
* Fix alignment problem on some platform (#617, #518)
78
* Fix conflict std::tuple, std::pair, and boost::fusion::sequence problem (#619)
89

10+
# 2017-08-03 version 2.1.4 (Invalid)
11+
* See https://github.com/msgpack/msgpack-c/issues/623
12+
913
# 2017-06-15 version 2.1.3
1014
* Improve build system (#603)
1115
* Add C++17 adaptors `std::optional` and `std::string_view`. (#607, #608)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
`msgpack` for C/C++
22
===================
33

4-
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)
4+
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)
55

66
It's like JSON but small and fast.
77

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.1.4.{build}
1+
version: 2.1.5.{build}
22

33
image:
44
- Visual Studio 2015

include/msgpack/version_master.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#define MSGPACK_VERSION_MAJOR 2
22
#define MSGPACK_VERSION_MINOR 1
3-
#define MSGPACK_VERSION_REVISION 4
3+
#define MSGPACK_VERSION_REVISION 5

0 commit comments

Comments
 (0)