summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-06-21 12:33:21 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2017-06-21 12:33:21 -0700
commit1b79e9a9a71969a261bb41cf9b8a93948b5f5877 (patch)
tree2237577e6fb7a51589157f6fb1cbfcb1a38a7ff9
parent5605afa19d54c9ff5450a0186a29c95c666f6503 (diff)
downloadffi-yajl-1b79e9a9a71969a261bb41cf9b8a93948b5f5877.tar.gz
bump version2.3.1
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--CHANGELOG.md9
-rw-r--r--lib/ffi_yajl/version.rb4
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf29ee1..f886169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Change Log
+## [Unreleased](https://github.com/chef/ffi-yajl/tree/HEAD)
+
+[Full Changelog](https://github.com/chef/ffi-yajl/compare/2.3.0...HEAD)
+
+**Merged pull requests:**
+
+- Require Ruby 2.2 and fix testing [\#87](https://github.com/chef/ffi-yajl/pull/87) ([tas50](https://github.com/tas50))
+- Fix license. [\#86](https://github.com/chef/ffi-yajl/pull/86) ([voxik](https://github.com/voxik))
+
## [2.3.0](https://github.com/chef/ffi-yajl/tree/2.3.0) (2016-07-22)
[Full Changelog](https://github.com/chef/ffi-yajl/compare/2.2.3...2.3.0)
diff --git a/lib/ffi_yajl/version.rb b/lib/ffi_yajl/version.rb
index ccbcfad..e5d669f 100644
--- a/lib/ffi_yajl/version.rb
+++ b/lib/ffi_yajl/version.rb
@@ -1,5 +1,5 @@
# Copyright (c) 2015 Lamont Granquist
-# Copyright (c) 2015 Chef Software, Inc.
+# Copyright (c) 2015-2017, Chef Software Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -21,5 +21,5 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module FFI_Yajl
- VERSION = "2.3.0"
+ VERSION = "2.3.1"
end