summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-30 15:14:06 -0700
committerGitHub <noreply@github.com>2016-08-30 15:14:06 -0700
commitae2f0b958e21a68177ffab0312a636e36b004e2b (patch)
tree661c5f64d7c57c87c314bc7558bcd72e37da3be6
parentf7ed14d0692aa5aaa86325df3710a0c7708d4357 (diff)
parent2f19779b9857b3eb3b9cc86882466e478cbaa3de (diff)
downloadmixlib-config-ae2f0b958e21a68177ffab0312a636e36b004e2b.tar.gz
Merge pull request #41 from chef/bumpv2.2.3
release 2.2.3
-rw-r--r--CHANGELOG.md10
-rw-r--r--lib/mixlib/config/version.rb2
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 903da6f..9d227fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Change Log
+## [2.2.3](https://github.com/chef/mixlib-config/tree/2.2.3) (2016-08-30)
+[Full Changelog](https://github.com/chef/mixlib-config/compare/v2.2.2...2.2.3)
+
+**Merged pull requests:**
+
+- Dont reset state during restore [\#40](https://github.com/chef/mixlib-config/pull/40) ([mwrock](https://github.com/mwrock))
+- Ignore Gemfile.lock [\#39](https://github.com/chef/mixlib-config/pull/39) ([tas50](https://github.com/tas50))
+- Update specs for rspec 3.0 [\#38](https://github.com/chef/mixlib-config/pull/38) ([tas50](https://github.com/tas50))
+- Bump version to 2.2.2 [\#37](https://github.com/chef/mixlib-config/pull/37) ([jkeiser](https://github.com/jkeiser))
+
## [2.2.2](https://github.com/chef/mixlib-config/tree/2.2.2) (2016-08-22)
[Full Changelog](https://github.com/chef/mixlib-config/compare/v2.2.1...2.2.2)
diff --git a/lib/mixlib/config/version.rb b/lib/mixlib/config/version.rb
index 171b0f8..fab3749 100644
--- a/lib/mixlib/config/version.rb
+++ b/lib/mixlib/config/version.rb
@@ -19,7 +19,7 @@
module Mixlib
module Config
- VERSION = "2.2.2"
+ VERSION = "2.2.3"
end
end