summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-02-17 15:39:27 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2015-02-17 15:39:27 -0800
commit80ff045c57c495e150d442c737e3ba5a68d47147 (patch)
tree711dc381ef790e009c9560344f660ab4a3e25e19
parent6e9fbb66d86d2020ea31ed7c3f7492b852664d38 (diff)
parent0f1c327dcfee4e19c58afcda05b1378547650933 (diff)
downloadffi-yajl-80ff045c57c495e150d442c737e3ba5a68d47147.tar.gz
Merge pull request #44 from chef/lcg/fix-windows-check
Lcg/fix windows check
-rw-r--r--CHANGELOG.md8
-rw-r--r--README.md2
-rw-r--r--ffi-yajl.gemspec.shared2
-rw-r--r--lib/ffi_yajl/version.rb2
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8724d54..603274a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,20 @@
### Changes
+### Bugs fixed
+
+## 1.4.0 (02/17/2015)
+
+### New features
+
* Implement :validate_utf8 (on by default) which can be set to false to suppress validation
### Bugs fixed
* [**Elan Ruusamäe**](https://github.com/glensc):
include status code for Unknown Error
+* [**Tyler Vann-Campbell**](https://github.com/lrdcasimir)
+ Fix check for windows? on cygwin and get dll name right
* Correctly throw useful invalid UTF-8 error exception
## 1.3.1 (11/24/2014)
diff --git a/README.md b/README.md
index 4044b72..de23bfc 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/opscode/ffi-yajl.png)](https://travis-ci.org/opscode/ffi-yajl) [![Code Climate](https://codeclimate.com/github/opscode/ffi-yajl.png)](https://codeclimate.com/github/opscode/ffi-yajl)
+[![Build Status](https://travis-ci.org/chef/ffi-yajl.png)](https://travis-ci.org/chef/ffi-yajl) [![Code Climate](https://codeclimate.com/github/chef/ffi-yajl.png)](https://codeclimate.com/github/chef/ffi-yajl)
# FFI YAJL
diff --git a/ffi-yajl.gemspec.shared b/ffi-yajl.gemspec.shared
index 356185d..2226fbd 100644
--- a/ffi-yajl.gemspec.shared
+++ b/ffi-yajl.gemspec.shared
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.description = s.summary
s.author = "Lamont Granquist"
s.email = "lamont@getchef.com"
- s.homepage = "http://github.com/opscode/ffi-yajl"
+ s.homepage = "http://github.com/chef/ffi-yajl"
s.add_development_dependency "rake", "~> 10.1"
s.add_development_dependency "rspec", "~> 2.99"
diff --git a/lib/ffi_yajl/version.rb b/lib/ffi_yajl/version.rb
index dffcc29..5f62ec1 100644
--- a/lib/ffi_yajl/version.rb
+++ b/lib/ffi_yajl/version.rb
@@ -1,3 +1,3 @@
module FFI_Yajl
- VERSION = "1.3.1"
+ VERSION = "1.4.0"
end