summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-09-22 15:03:47 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-09-22 15:03:47 -0700
commite5294ab56f26ccb35338032f656ac2e7362b61f1 (patch)
tree3a6c8471d3b6c92ff8567f18780fe775fbc2396d /CHANGELOG.md
parent09a9f6c9e643e3e7bd2d7826537a8aff5add5e45 (diff)
downloadffi-yajl-e5294ab56f26ccb35338032f656ac2e7362b61f1.tar.gz
add CHANGELOG.md updates
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a5962b..aa0a9db 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.2.2...HEAD)
+
+**Merged pull requests:**
+
+- Remove ruby 1.9.2 support [\#73](https://github.com/chef/ffi-yajl/pull/73) ([lamont-granquist](https://github.com/lamont-granquist))
+- Use github-changelog-generator to generate CHANGELOG.md file [\#72](https://github.com/chef/ffi-yajl/pull/72) ([lamont-granquist](https://github.com/lamont-granquist))
+
## [2.2.2](https://github.com/chef/ffi-yajl/tree/2.2.2) (2015-07-15)
[Full Changelog](https://github.com/chef/ffi-yajl/compare/2.2.1...2.2.2)