Merge pull request #28 from hunner/release_1.1.0

Release 1.1.0
voxpupuli · Oct 15, 2014 · c5ab124 · c5ab124
2 parents 180e9d6 + 6ef2f61
commit c5ab124
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,15 @@
+2014-10-15 Release 1.1.0
+Features:
+- Added eyaml, eyaml_datadir, & eyaml_extension parameters to hiera class for configuring hiera-eyaml
+- Added hiera::datadir_manage parameter to disable datadir management
+- Added hiera::logger parameter to change logger
+- Added hiera::merge_behavior parameter to change the hash merge behavior
+- Added some spec tests
+- Added new readme
+
+Bugfixes:
+- Correct datadir regex {} matching
+
 2014-05-01 Release 1.0.2
 - Remove swap files from package
 

diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name    'hunner-hiera'
-version '1.0.2'
+version '1.1.0'
 source 'UNKNOWN'
 author 'hunner'
 license 'BSD'