summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-09-02 09:10:11 -0700
committerMatt Wrock <matt@mattwrock.com>2016-09-02 09:10:11 -0700
commitfa0a894ae705968af998105ae0f415586664fde1 (patch)
tree54acb82ba8cd36f1080f686f0f92737c5e9a1ad4
parentcf1bd5c35e975874b774a62553c211235be896a2 (diff)
downloadmixlib-config-fa0a894ae705968af998105ae0f415586664fde1.tar.gz
release 2.2.42.2.4
-rw-r--r--CHANGELOG.md8
-rw-r--r--lib/mixlib/config/version.rb2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d227fb..5a4f8d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Change Log
+## [2.2.4](https://github.com/chef/mixlib-config/tree/2.2.4) (2016-09-02)
+[Full Changelog](https://github.com/chef/mixlib-config/compare/v2.2.3...2.2.4)
+
+**Merged pull requests:**
+
+- Allow a config context to be set from another config context [\#42](https://github.com/chef/mixlib-config/pull/42) ([mwrock](https://github.com/mwrock))
+- Allow configuring contexts via block [\#35](https://github.com/chef/mixlib-config/pull/35) ([KierranM](https://github.com/KierranM))
+
## [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)
diff --git a/lib/mixlib/config/version.rb b/lib/mixlib/config/version.rb
index fab3749..bb005df 100644
--- a/lib/mixlib/config/version.rb
+++ b/lib/mixlib/config/version.rb
@@ -19,7 +19,7 @@
module Mixlib
module Config
- VERSION = "2.2.3"
+ VERSION = "2.2.4"
end
end