summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2015-04-06 11:45:03 -0500
committertyler-ball <tyleraball@gmail.com>2015-04-06 11:45:03 -0500
commitc382a878b0e24aea0da6a1412900a517caa7d8eb (patch)
tree4bea480e00c696a546ab12b7a4b51ddd53b50d9e
parent9c55f676e7d58cf1a48f63f51feca672ae549e1a (diff)
downloadchef-zero-c382a878b0e24aea0da6a1412900a517caa7d8eb.tar.gz
Updating changelog and version for 4.2.0 release
-rw-r--r--CHANGELOG.md10
-rw-r--r--lib/chef_zero/version.rb2
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 322c820..b870115 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
Chef Zero CHANGELOG
===================
-# unreleased
+# 4.2.0
+
+* [PR#124](https://github.com/chef/chef-zero/pull/124): Bump ffi-yajl
+ dependency
+* [PR#119](https://github.com/chef/chef-zero/pull/119): Add
+ :organization and :data_scope options to RSpec support method
+ `with_chef_server`
+
+# 4.1.0
* [PR#121](https://github.com/chef/chef-zero/pull/121): Add Socketless
mode.
diff --git a/lib/chef_zero/version.rb b/lib/chef_zero/version.rb
index e1635a3..f43e275 100644
--- a/lib/chef_zero/version.rb
+++ b/lib/chef_zero/version.rb
@@ -1,3 +1,3 @@
module ChefZero
- VERSION = '4.1.0'
+ VERSION = '4.2.0'
end